|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Makefile generated by fpcmake v0.99.13 on 1999-12-06 18:33
|
|
|
+# Makefile generated by fpcmake v0.99.13 on 1999-12-13 23:59
|
|
|
#
|
|
|
|
|
|
defaultrule: all
|
|
|
@@ -72,17 +72,12 @@ override CPU_TARGET:=i386
|
|
|
|
|
|
# What compiler to use ?
|
|
|
ifndef FPC
|
|
|
-# Compatibility with old makefiles
|
|
|
-ifdef PP
|
|
|
-export FPC=$(PP)
|
|
|
-else
|
|
|
ifdef inOS2
|
|
|
export FPC=ppos2$(EXEEXT)
|
|
|
else
|
|
|
export FPC=ppc386$(EXEEXT)
|
|
|
endif
|
|
|
endif
|
|
|
-endif
|
|
|
|
|
|
# Target OS
|
|
|
ifndef OS_TARGET
|
|
|
@@ -243,7 +238,6 @@ endif
|
|
|
|
|
|
# create fcldir,rtldir,unitdir
|
|
|
ifdef FPCDIR
|
|
|
-override FPCDIR:=$(subst \,/,$(FPCDIR))
|
|
|
ifneq ($(FPCDIR),.)
|
|
|
override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
|
|
|
override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
|
|
|
@@ -383,15 +377,7 @@ ifdef CFGFILE
|
|
|
override FPCOPT+=@$(CFGFILE)
|
|
|
endif
|
|
|
|
|
|
-# For win32 the options are passed using the environment variable FPCEXTCMD
|
|
|
-ifeq ($(OS_SOURCE),win32)
|
|
|
-override FPCEXTCMD:=$(FPCOPT)
|
|
|
-override FPCOPT:=!FPCEXTCMD
|
|
|
-export FPCEXTCMD
|
|
|
-endif
|
|
|
-
|
|
|
-# Compiler commandline
|
|
|
-override COMPILER:=$(FPC) $(FPCOPT)
|
|
|
+override COMPILER=$(FPC) $(FPCOPT)
|
|
|
|
|
|
#####################################################################
|
|
|
# Shell tools
|
|
|
@@ -483,7 +469,7 @@ endif
|
|
|
ifeq (,$(findstring -s ,$(COMPILER)))
|
|
|
EXECPPAS=
|
|
|
else
|
|
|
-EXECPPAS:=@$(PPAS)
|
|
|
+EXECPPAS=@$(PPAS)
|
|
|
endif
|
|
|
|
|
|
# ldconfig to rebuild .so cache
|
|
|
@@ -719,7 +705,7 @@ override CLEANTARGET+=fpc_loaders_clean
|
|
|
override SHOWINSTALLTARGET+=fpc_loaders_showinstall
|
|
|
override INSTALLTARGET+=fpc_loaders_install
|
|
|
|
|
|
-override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))
|
|
|
+override LOADEROFILES=$(addsuffix $(OEXT),$(LOADEROBJECTS))
|
|
|
|
|
|
fpc_loaders: $(LOADEROFILES)
|
|
|
|
|
|
@@ -791,7 +777,7 @@ fpc_debug:
|
|
|
|
|
|
# Default sharedlib units are all unit objects
|
|
|
ifndef SHAREDLIBUNITOBJECTS
|
|
|
-SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
|
|
|
+SHAREDLIBUNITOBJECTS=$(UNITOBJECTS)
|
|
|
endif
|
|
|
|
|
|
fpc_smart:
|
|
|
@@ -821,13 +807,13 @@ endif
|
|
|
ifdef INSTALLPPUFILES
|
|
|
ifdef PPUFILES
|
|
|
ifdef inlinux
|
|
|
-INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
|
|
|
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
|
|
|
+INSTALLPPULINKFILES=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
|
|
|
+INSTALLPPULIBFILES=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
|
|
|
else
|
|
|
-INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
|
|
|
+INSTALLPPULINKFILES=$(shell $(PPUFILES) $(INSTALLPPUFILES))
|
|
|
endif
|
|
|
else
|
|
|
-INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))
|
|
|
+INSTALLPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))
|
|
|
endif
|
|
|
endif
|
|
|
|
|
|
@@ -901,7 +887,7 @@ endif
|
|
|
|
|
|
# Test dir if none specified
|
|
|
ifndef DESTZIPDIR
|
|
|
-DESTZIPDIR:=$(BASEDIR)
|
|
|
+DESTZIPDIR=$(BASEDIR)
|
|
|
endif
|
|
|
|
|
|
# Add .zip/.tar.gz extension
|
|
|
@@ -956,9 +942,9 @@ endif
|
|
|
|
|
|
ifdef CLEANPPUFILES
|
|
|
ifdef PPUFILES
|
|
|
-CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))
|
|
|
+CLEANPPULINKFILES=$(shell $(PPUFILES) $(CLEANPPUFILES))
|
|
|
else
|
|
|
-CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES))
|
|
|
+CLEANPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES))
|
|
|
endif
|
|
|
endif
|
|
|
|
|
|
@@ -1136,4 +1122,4 @@ heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMPPU)
|
|
|
|
|
|
msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU)
|
|
|
|
|
|
-ports$(PPUEXT) : ports.pp $(SYSTEMPPU)
|
|
|
+ports$(PPUEXT) : ports.pp objpas$(PPUEXT) $(SYSTEMPPU)
|
florian