|
@@ -975,8 +975,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
'# Install rules'#010+
|
|
'# Install rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '.PHONY: fpc_packagefpc fpc_insta','ll fpc_sourceinstall fpc_exampleinst'+
|
|
|
|
- 'all'#010+
|
|
|
|
|
|
+ '.PHONY: fpc_install fpc_sourcein','stall fpc_exampleinstall'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef INSTALL_UNITS'#010+
|
|
'ifdef INSTALL_UNITS'#010+
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
|
@@ -984,12 +983,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
- 'LES)) $(addpre','fix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
|
|
|
|
|
|
+ 'LES)) $(addprefix $(STATICLIB','PREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
|
|
'T),$(INSTALLPPUFILES)))'#010+
|
|
'T),$(INSTALLPPUFILES)))'#010+
|
|
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
|
|
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
|
|
'PPUFILES))'#010+
|
|
'PPUFILES))'#010+
|
|
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
- 'EFIX),$(INS','TALLPPULINKFILES)))'#010+
|
|
|
|
|
|
+ 'EFIX),$(INSTALLPPULINKFILE','S)))'#010+
|
|
|
|
+ '# Implicitly install Package.fpc'#010+
|
|
|
|
+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
@@ -998,77 +999,85 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_install: $(INSTALLTARGET)'#010+
|
|
'fpc_install: $(INSTALLTARGET)'#010+
|
|
- '# Create UnitInstallFiles'#010+
|
|
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
- ' $(MKDIR) $(INSTALL_BI','NDIR)'#010+
|
|
|
|
|
|
+ ' ',' $(MKDIR) $(INSTALL_BINDIR)'#010+
|
|
'# Compress the exes if upx is defined'#010+
|
|
'# Compress the exes if upx is defined'#010+
|
|
'ifdef UPXPROG'#010+
|
|
'ifdef UPXPROG'#010+
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'ifdef INSTALLPPUFILES'#010+
|
|
|
|
- ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
|
- 'ifdef FPCMAKE'#010,
|
|
|
|
- '# If the package version is also set then we are the main package,'#010+
|
|
|
|
- '# then we create and install Package.fpc for the package'#010+
|
|
|
|
|
|
+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+
|
|
|
|
+ 'ifdef FPCMAKE',#010+
|
|
|
|
+ '# If the fpcpackage variable is set then create and install Package.fp'+
|
|
|
|
+ 'c,'#010+
|
|
|
|
+ '# a safety check is done if Makefile.fpc is available'#010+
|
|
'ifdef PACKAGE_VERSION'#010+
|
|
'ifdef PACKAGE_VERSION'#010+
|
|
|
|
+ 'ifneq ($(wildcard Makefile.fpc),)'#010+
|
|
' $(FPCMAKE) -p Makefile.fpc'#010+
|
|
' $(FPCMAKE) -p Makefile.fpc'#010+
|
|
|
|
+ ' $(MKDIR) $(IN','STALL_UNITDIR)'#010+
|
|
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
|
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'end','if'#010+
|
|
|
|
|
|
+ 'endif'#010+
|
|
|
|
+ 'endif'#010+
|
|
|
|
+ 'endif'#010+
|
|
|
|
+ 'ifdef INSTALLPPUFILES'#010+
|
|
|
|
+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
|
'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
- ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
|
|
|
+ ' ',' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
|
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
|
- ' $','(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
|
|
|
|
+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
'ifdef inUnix'#010+
|
|
'ifdef inUnix'#010+
|
|
- ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
|
|
|
|
|
+ ' ln -sf $(LIB_FULLNAME) $(INSTAL','L_LIBDIR)/$(LIB_NAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef INSTALL_FILES'#010+
|
|
'ifdef INSTALL_FILES'#010+
|
|
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
|
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
|
- ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DA','TADIR)'#010+
|
|
|
|
|
|
+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_sourceinstall: distclean'#010+
|
|
'fpc_sourceinstall: distclean'#010+
|
|
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
- ' $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
|
|
|
|
+ ' $(COPYT','REE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
|
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
|
'ifdef HASEXAMPLES'#010+
|
|
'ifdef HASEXAMPLES'#010+
|
|
- ' $(MKDIR) $(INS','TALL_EXAMPLEDIR)'#010+
|
|
|
|
|
|
+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef EXAMPLESOURCEFILES'#010+
|
|
'ifdef EXAMPLESOURCEFILES'#010+
|
|
- ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
|
|
|
|
|
|
+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_','EXAMPLEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
|
|
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
|
|
'AMPLEDIR)'#010+
|
|
'AMPLEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '[distinstallru','les]'#010+
|
|
|
|
|
|
+ '[distinstallrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Dist Install'#010+
|
|
'# Dist Install'#010+
|
|
- '#####################################################################'#010+
|
|
|
|
|
|
+ '######','##############################################################'+
|
|
|
|
+ '#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_distinstall'#010+
|
|
'.PHONY: fpc_distinstall'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_distinstall: install exampleinstall'#010+
|
|
'fpc_distinstall: install exampleinstall'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
- '[zipinstallr','ules]'#010+
|
|
|
|
|
|
+ '[zipinstallrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Zip'#010+
|
|
'# Zip'#010+
|
|
- '#####################################################################'#010+
|
|
|
|
|
|
+ '##############','######################################################'+
|
|
|
|
+ '#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
|
|
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
|
|
#010+
|
|
#010+
|
|
- '# Temporary path to ','pack a file, can only use a single deep'#010+
|
|
|
|
- '# subdir, because the deltree can'#039't see the whole tree to remove'#010+
|
|
|
|
|
|
+ '# Temporary path to pack a file, can only use a single deep'#010+
|
|
|
|
+ '# subdir, because the deltree can'#039't see the whole tree t','o remove'+
|
|
|
|
+ #010+
|
|
'ifndef PACKDIR'#010+
|
|
'ifndef PACKDIR'#010+
|
|
'ifndef inUnix'#010+
|
|
'ifndef inUnix'#010+
|
|
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
|
|
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
|
|
@@ -1077,12 +1086,12 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Maybe create default zipname from',' packagename'#010+
|
|
|
|
|
|
+ '# Maybe create default zipname from packagename'#010+
|
|
'ifndef ZIPNAME'#010+
|
|
'ifndef ZIPNAME'#010+
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- 'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
|
|
|
|
|
|
+ 'ZIPNAME=$(ZIPPREFIX)','$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1092,7 +1101,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
'ZIPTARGET=DIST_ZIPTARGET'#010+
|
|
'ZIPTARGET=DIST_ZIPTARGET'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'ZIPTARGET=install'#010+
|
|
'ZIPTARGET=install'#010+
|
|
- 'endif',#010+
|
|
|
|
|
|
+ 'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Use tar by default under linux'#010+
|
|
'# Use tar by default under linux'#010+
|
|
@@ -1102,66 +1111,66 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Use a wrapper script by default for Os/2'#010+
|
|
|
|
|
|
+ '# Use ','a wrapper script by default for Os/2'#010+
|
|
'ifndef inUnix'#010+
|
|
'ifndef inUnix'#010+
|
|
'USEZIPWRAPPER=1'#010+
|
|
'USEZIPWRAPPER=1'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# We need to be able to run in the current OS so fix'#010+
|
|
'# We need to be able to run in the current OS so fix'#010+
|
|
- '# the path separa','tor'#010+
|
|
|
|
|
|
+ '# the path separator'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
- 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT))'#010+
|
|
|
|
|
|
+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fp','czip$(BATCHEXT))'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'ZIPPATHSEP=/'#010+
|
|
'ZIPPATHSEP=/'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Create commands to create the zip/tar file'#010+
|
|
'# Create commands to create the zip/tar file'#010+
|
|
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
|
|
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
|
|
- 'ZIP','CMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
|
|
|
|
|
|
+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
|
|
'ifdef USETAR'#010+
|
|
'ifdef USETAR'#010+
|
|
- 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
|
|
|
|
+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(Z','IPNAME)$(TAREXT)'#010+
|
|
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
|
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
|
- 'ZIPCMD_ZIP:=$(subst /',',$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+
|
|
|
|
- 'ESTFILE) *'#010+
|
|
|
|
|
|
+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
|
|
|
+ 'TFILE) *'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_zipinstall:'#010+
|
|
'fpc_zipinstall:'#010+
|
|
- ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
|
|
|
|
+ ' $(MAKE)',' $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
' $(DEL) $(ZIPDESTFILE)'#010+
|
|
' $(DEL) $(ZIPDESTFILE)'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
- '# Handle gecho separate as we need to esp','ace \ with \\'#010+
|
|
|
|
|
|
+ '# Handle gecho separate as we need to espace \ with \\'#010+
|
|
'ifneq ($(ECHOREDIR),echo)'#010+
|
|
'ifneq ($(ECHOREDIR),echo)'#010+
|
|
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
|
|
|
|
- 'R)'#010+
|
|
|
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))"',' > $(ZIPWRAP'+
|
|
|
|
+ 'PER)'#010+
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
|
|
#010+
|
|
#010+
|
|
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))"',' >> $(ZIPWRA'+
|
|
|
|
- 'PPER)'#010+
|
|
|
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
|
|
|
|
+ 'ER)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
|
|
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
|
|
- ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
|
|
|
|
+ ' echo $(ZIPCMD_ZIP) ','>> $(ZIPWRAPPER)'#010+
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef inUnix'#010+
|
|
'ifdef inUnix'#010+
|
|
' /bin/sh $(ZIPWRAPPER)'#010+
|
|
' /bin/sh $(ZIPWRAPPER)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
' $(ZIPWRAPPER)'#010+
|
|
' $(ZIPWRAPPER)'#010+
|
|
- 'endi','f'#010+
|
|
|
|
|
|
+ 'endif'#010+
|
|
' $(DEL) $(ZIPWRAPPER)'#010+
|
|
' $(DEL) $(ZIPWRAPPER)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
|
|
|
|
|
+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010,
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_zipsourceinstall:'#010+
|
|
'fpc_zipsourceinstall:'#010+
|
|
' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+
|
|
' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_zipexamplei','nstall:'#010+
|
|
|
|
|
|
+ 'fpc_zipexampleinstall:'#010+
|
|
'ifdef HASEXAMPLES'#010+
|
|
'ifdef HASEXAMPLES'#010+
|
|
- ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+
|
|
|
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010,
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_zipdistinstall:'#010+
|
|
'fpc_zipdistinstall:'#010+
|
|
@@ -1169,171 +1178,168 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[cleanrules]'#010+
|
|
'[cleanrules]'#010+
|
|
- '#################################################','###################'+
|
|
|
|
- '#'#010+
|
|
|
|
- '# Clean rules'#010+
|
|
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
|
|
+ '# Clean rules'#010+
|
|
|
|
+ '#############################################################','#######'+
|
|
|
|
+ '#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef EXEFILES'#010+
|
|
'ifdef EXEFILES'#010+
|
|
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
|
|
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
|
|
- '))'#010,
|
|
|
|
|
|
+ '))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef CLEAN_UNITS'#010+
|
|
'ifdef CLEAN_UNITS'#010+
|
|
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
|
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- 'ifdef CLEANPPUFILES'#010+
|
|
|
|
|
|
+ 'if','def CLEANPPUFILES'#010+
|
|
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
|
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
|
- ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STA','TICLIBEXT),$'+
|
|
|
|
- '(CLEANPPUFILES)))'#010+
|
|
|
|
- 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
|
|
|
- 'ILES))'#010+
|
|
|
|
|
|
+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
|
|
|
|
+ 'LEANPPUFILES)))'#010+
|
|
|
|
+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN','PP'+
|
|
|
|
+ 'UFILES))'#010+
|
|
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
|
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
|
'IX),$(CLEANPPULINKFILES)))'#010+
|
|
'IX),$(CLEANPPULINKFILES)))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_clean: $(CLEANTARGET)'#010+
|
|
'fpc_clean: $(CLEANTARGET)'#010+
|
|
- 'ifd','ef CLEANEXEFILES'#010+
|
|
|
|
|
|
+ 'ifdef CLEANEXEFILES'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef CLEANPPUFILES'#010+
|
|
'ifdef CLEANPPUFILES'#010+
|
|
- ' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
|
|
|
+ ' -$(DEL) $(CL','EANPPUFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef CLEANRSTFILES'#010+
|
|
'ifdef CLEANRSTFILES'#010+
|
|
- ' -$(DEL) $(addprefix $(UN','ITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
|
|
|
|
- #010+
|
|
|
|
|
|
+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef CLEAN_FILES'#010+
|
|
'ifdef CLEAN_FILES'#010+
|
|
' -$(DEL) $(CLEAN_FILES)'#010+
|
|
' -$(DEL) $(CLEAN_FILES)'#010+
|
|
- 'endif'#010+
|
|
|
|
|
|
+ 'endi','f'#010+
|
|
'ifdef LIB_NAME'#010+
|
|
'ifdef LIB_NAME'#010+
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) '+
|
|
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) '+
|
|
- '$(REDIR','FILE)'#010+
|
|
|
|
|
|
+ '$(REDIRFILE)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_distclean: clean'#010+
|
|
'fpc_distclean: clean'#010+
|
|
#010+
|
|
#010+
|
|
- '# Also run clean first if targetdir is set. Unittargetdir is always'#010+
|
|
|
|
|
|
+ '# Also run clean first if targetdir is set. Unittargetdir is always',#010+
|
|
'# set if targetdir or unittargetdir is specified'#010+
|
|
'# set if targetdir or unittargetdir is specified'#010+
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
'TARGETDIRCLEAN=fpc_clean'#010+
|
|
'TARGETDIRCLEAN=fpc_clean'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_cleanall: $(CLEANTARGET) $(TA','RGETDIRCLEAN)'#010+
|
|
|
|
|
|
+ 'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+
|
|
'ifdef CLEANEXEFILES'#010+
|
|
'ifdef CLEANEXEFILES'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
|
|
- 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
|
|
|
|
+ ' -$(DEL) *$(OEXT',') *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+
|
|
|
|
+ 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
- ' -$(DEL) $(FPCMADE) $(PP','AS) link.res $(FPCEXTFILE) $(REDIRFIL'+
|
|
|
|
- 'E)'#010+
|
|
|
|
|
|
+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
|
|
|
|
+ #010+
|
|
'ifdef AOUTEXT'#010+
|
|
'ifdef AOUTEXT'#010+
|
|
' -$(DEL) *$(AOUTEXT)'#010+
|
|
' -$(DEL) *$(AOUTEXT)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
- '[inforules]'#010+
|
|
|
|
|
|
+ '[infor','ules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Info rules'#010+
|
|
'# Info rules'#010+
|
|
- '#######################################################','#############'+
|
|
|
|
- '#'#010+
|
|
|
|
|
|
+ '#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_info'#010+
|
|
'.PHONY: fpc_info'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_info:'#010+
|
|
'fpc_info:'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) == Package info =='#010+
|
|
|
|
|
|
+ ' @$(ECHO) == Package info =','='#010+
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) ','== Configuration info =='#010+
|
|
|
|
|
|
+ ' @$(ECHO) == Configuration info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) FPC.......... $(FPC)'#010+
|
|
' @$(ECHO) FPC.......... $(FPC)'#010+
|
|
- ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
|
|
|
|
|
+ ' @$(ECHO',') FPC Version.. $(FPC_VERSION)'#010+
|
|
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
|
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
|
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
|
|
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
|
|
- ' @$(ECHO) So','urce OS.... $(OS_SOURCE)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
|
|
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
|
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) == Directory info =='#010+
|
|
|
|
|
|
+ ' @','$(ECHO) == Directory info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
|
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
|
- ' ',' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
|
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
|
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
|
- ' @$(ECHO)'#010+
|
|
|
|
|
|
+ ' ',' @$(ECHO)'#010+
|
|
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) ',' == Tools info =='#010+
|
|
|
|
|
|
+ ' @$(ECHO) == Tools info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Pwd....... $(PWD)'#010+
|
|
' @$(ECHO) Pwd....... $(PWD)'#010+
|
|
- ' @$(ECHO) Mv........ $(MVPROG)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Mv.....','... $(MVPROG)'#010+
|
|
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
- ' @$(','ECHO) Echo...... $(ECHO)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
- ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) FPCMake... $(FP','CMAKE)'#010+
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
|
|
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
|
|
- ' @$(ECHO)'#010,
|
|
|
|
|
|
+ ' @$(ECHO)'#010+
|
|
' @$(ECHO) == Object info =='#010+
|
|
' @$(ECHO) == Object info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) Target Loaders...... $(TARGET_LOADERS)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Target Loaders...... $(TA','RGET_LOADERS)'#010+
|
|
' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+
|
|
' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+
|
|
' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+
|
|
' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+
|
|
- ' @$(ECHO) ',' Target Dirs......... $(TARGET_DIRS)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+
|
|
' @$(ECHO) Target Examples..... $(TARGET_EXAMPLES)'#010+
|
|
' @$(ECHO) Target Examples..... $(TARGET_EXAMPLES)'#010+
|
|
- ' @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
|
|
|
|
|
|
+ ' ',' @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
|
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
|
- ' @$(EC','HO) Clean Files......... $(CLEAN_FILES)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Install Units.......',' $(INSTALL_UNITS)'#010+
|
|
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Install info =='#010+
|
|
' @$(ECHO) == Install info =='#010+
|
|
- ' @$(ECHO)',#010+
|
|
|
|
|
|
+ ' @$(ECHO)'#010+
|
|
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
- ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) ZipPrefix............ $(ZI','PPREFIX)'#010+
|
|
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
|
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' ',' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
|
|
|
|
- ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
|
|
|
|
+ ' @$(ECHO) Install binary dir... ','$(INSTALL_BINDIR)'#010+
|
|
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
|
|
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
|
|
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
|
|
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
|
|
- ' @','$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
|
|
|
|
- ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
|
|
|
|
+ ' @$(ECHO) Install doc dir...... $(IN','STALL_DOCDIR)'#010+
|
|
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
|
|
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
|
|
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
|
|
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
|
|
- ' @','$(ECHO)'#010+
|
|
|
|
|
|
+ ' @$(ECHO)'#010+
|
|
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
|
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
|
- ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Dist zip name.','....... $(DIST_ZIPNAME)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
#010+
|
|
#010+
|
|
'[localmakefile]'#010+
|
|
'[localmakefile]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
- '# Local Makefile',#010+
|
|
|
|
|
|
+ '# Local Makefile'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- 'ifneq ($(wildcard fpcmake.loc),)'#010+
|
|
|
|
|
|
+ 'ifneq ($(wildcard fpcmak','e.loc),)'#010+
|
|
'include fpcmake.loc'#010+
|
|
'include fpcmake.loc'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'[userrules]'#010+
|
|
'[userrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Users rules'#010+
|
|
'# Users rules'#010+
|
|
- '############','########################################################'+
|
|
|
|
- '#'#010
|
|
|
|
|
|
+ '#####################################################################'#010
|
|
);
|
|
);
|