|
@@ -1,13 +1,14 @@
|
|
|
#
|
|
|
-# Makefile generated by fpcmake v1.00 [2000/10/27]
|
|
|
+# Makefile generated by fpcmake v1.00 [2000/12/19]
|
|
|
#
|
|
|
|
|
|
defaultrule: all
|
|
|
|
|
|
#####################################################################
|
|
|
-# Autodetect OS (Linux or Dos or Windows NT)
|
|
|
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
|
|
|
# define inUnix when running under Unix (Linux,FreeBSD)
|
|
|
# define inWinNT when running under WinNT
|
|
|
+# define inOS2 when running under OS/2
|
|
|
#####################################################################
|
|
|
|
|
|
# We need only / in the path
|
|
@@ -24,6 +25,7 @@ nopwd:
|
|
|
@exit
|
|
|
else
|
|
|
inUnix=1
|
|
|
+PWD:=$(firstword $(PWD))
|
|
|
endif
|
|
|
else
|
|
|
PWD:=$(firstword $(PWD))
|
|
@@ -637,14 +639,6 @@ DESTZIPDIR:=$(BASEDIR)
|
|
|
endif
|
|
|
export DESTZIPDIR
|
|
|
|
|
|
-# On linux, try to find where libgcc.a is.
|
|
|
-ifdef inUnix
|
|
|
-ifndef GCCLIBDIR
|
|
|
-GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
|
|
-endif
|
|
|
-endif
|
|
|
-export GCCLIBDIR
|
|
|
-
|
|
|
#####################################################################
|
|
|
# Install Directories
|
|
|
#####################################################################
|
|
@@ -819,16 +813,7 @@ ifdef UNITSDIR
|
|
|
override FPCOPT+=-Fu$(UNITSDIR)
|
|
|
endif
|
|
|
|
|
|
-<<<<<<< Makefile
|
|
|
-# Add GCC lib path if asked
|
|
|
-ifdef GCCLIBDIR
|
|
|
-override FPCOPT+=-Fl$(GCCLIBDIR)
|
|
|
-endif
|
|
|
-
|
|
|
# Target dirs and the prefix to use for clean/install
|
|
|
-=======
|
|
|
-# Target dirs and the prefix to use for clean/install
|
|
|
->>>>>>> 1.1.2.8
|
|
|
ifdef TARGETDIR
|
|
|
override FPCOPT+=-FE$(TARGETDIR)
|
|
|
ifeq ($(TARGETDIR),.)
|
|
@@ -951,39 +936,18 @@ fpc_units: $(UNITPPUFILES)
|
|
|
|
|
|
.PHONY: fpc_examples fpc_test
|
|
|
|
|
|
-<<<<<<< Makefile
|
|
|
-ifdef EXEOBJECTS
|
|
|
-override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
|
|
|
-override EXEOFILES:=$(addsuffix $(OEXT),$(EXEOBJECTS)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(EXEOBJECTS)))
|
|
|
-
|
|
|
-override ALLTARGET+=fpc_exes
|
|
|
-override INSTALLEXEFILES+=$(EXEFILES)
|
|
|
-override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
|
|
|
-=======
|
|
|
ifdef EXAMPLEOBJECTS
|
|
|
override EXAMPLESOURCEFILES:=$(addsuffix $(PASEXT),$(EXAMPLEOBJECTS))
|
|
|
override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
|
|
|
override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(EXAMPLEOBJECTS)))
|
|
|
->>>>>>> 1.1.2.8
|
|
|
|
|
|
-<<<<<<< Makefile
|
|
|
-=======
|
|
|
override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
|
|
|
->>>>>>> 1.1.2.8
|
|
|
endif
|
|
|
-<<<<<<< Makefile
|
|
|
-=======
|
|
|
|
|
|
fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(EXAMPLEDIROBJECTS))
|
|
|
->>>>>>> 1.1.2.8
|
|
|
|
|
|
-<<<<<<< Makefile
|
|
|
-fpc_exes: $(EXEFILES)
|
|
|
-
|
|
|
-=======
|
|
|
fpc_test: examples
|
|
|
|
|
|
->>>>>>> 1.1.2.8
|
|
|
#####################################################################
|
|
|
# General compile rules
|
|
|
#####################################################################
|
|
@@ -1176,6 +1140,9 @@ endif
|
|
|
ifeq ($(OS_TARGET),win32)
|
|
|
PACKAGESUFFIX=w32
|
|
|
endif
|
|
|
+ifeq ($(OS_TARGET),os2)
|
|
|
+PACKAGESUFFIX=emx
|
|
|
+endif
|
|
|
endif
|
|
|
|
|
|
# Temporary path to pack a file
|