From d1eb9015aef2ec6c26df2254d391a17cdd1c07da Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 23 Apr 2003 14:01:24 +0000 Subject: [PATCH] * compare full source and target if ppas needs to be run --- utils/fpcm/fpcmake.inc | 213 ++++++++++++++++++++--------------------- utils/fpcm/fpcmake.ini | 4 +- 2 files changed, 108 insertions(+), 109 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index c69c6be8c6..5ad5485d7c 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1264,12 +1264,12 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ '# also call ppas if with command option -s'#010+ - '# but only if the OS_SOURCE and OS_TARGET are equal'#010+ + '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ - 'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+ - 'E','XECPPAS:=@$(PPAS)'#010+ + 'ifeq ($(FULL_SOURCE),$(FULL_TA','RGET))'#010+ + 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1281,8 +1281,8 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '.PHONY: fpc_loaders'#010+ #010+ - 'ifdef TARGET_LOADERS'#010+ - 'o','verride ALLTARGET+=fpc_loaders'#010+ + 'ifdef TARGET_L','OADERS'#010+ + 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ @@ -1290,8 +1290,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ - ' $(AS) -o $*$(OEXT) $<'#010+ - #010, + ' $(AS) -o $*$(OE','XT) $<'#010+ + #010+ 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ @@ -1303,7 +1303,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '#################################','###################################'+ + '#########################','###########################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1313,14 +1313,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef TARGET_UNITS'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UN','ITS))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(T','ARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ - 'fpc_units: $(UNITPPU','FILES)'#010+ + 'fpc_units: $','(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -1331,20 +1331,20 @@ const fpcmakeini : array[0..182,1..240] of char=( '.PHONY: fpc_exes'#010+ #010+ 'ifdef TARGET_PROGRAMS'#010+ - 'override EXEFILES=$(addsuffix $(','EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(adds','uffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ - 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'over','ride CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override INSTALLEXEFILES+=$(EXEFIL','ES)'#010+ + 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))',#010+ + 'endif'#010+ 'endif'#010+ - 'e','ndif'#010+ #010+ 'fpc_exes: $(EXEFILES)'#010+ #010+ @@ -1355,7 +1355,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ - 'override RSTFILES=$(a','ddsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ + 'override RSTF','ILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ @@ -1364,7 +1364,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '################################################################','####'+ + '########################################################','############'+ '#'#010+ #010+ '.PHONY: fpc_examples'#010+ @@ -1373,14 +1373,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLE','S))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET','_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ ')))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override C','LEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'ov','erride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1390,7 +1390,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEF','ILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'fpc_examples: all $(','EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ @@ -1399,7 +1399,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_','all fpc_smart fpc_debug fpc_release'#010+ + '.PHO','NY: fpc_all fpc_smart fpc_debug fpc_release'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1410,7 +1410,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all DEBU','G=1'#010+ + ' $(MAKE) ','all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ @@ -1422,7 +1422,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECP','PAS)'#010+ + ' ',' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ @@ -1438,15 +1438,15 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ - #010+ - '# Search',' paths for .ppu and .pp and .pas'#010+ + #010, + '# Search paths for .ppu and .pp and .pas'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ #010+ '[libraryrules]'#010+ - '##################################','##################################'+ + '##########################','##########################################'+ '#'#010+ '# Library'#010+ '#####################################################################'#010+ @@ -1457,7 +1457,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef LIB_VERSION'#010+ 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ 'else'#010+ - 'LIB_FULLNAME=$(LIB_N','AME)'#010+ + 'LIB_FULLNAME','=$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1470,7 +1470,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef HASSHAREDLIB'#010+ ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ 'else'#010+ - ' @$(ECHO)',' Shared Libraries not supported'#010+ + ' ','@$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ @@ -1479,7 +1479,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install fpc_sour','ceinstall fpc_exampleinstall'#010+ + '.PHONY: fpc_install ','fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ @@ -1487,14 +1487,14 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ 'ifdef INSTALL_BUILDUNIT'#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ - '(INSTALLPPUFILES))'#010+ - 'endi','f'#010+ + '(INSTALLPPUFILE','S))'#010+ + 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+ ',$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIR','PREFIX),$(INSTA'+ + 'override INSTALLPPUFILES:=$(addprefix $(UNITT','ARGETDIRPREFIX),$(INSTA'+ 'LLPPUFILES))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(INSTALLPPULINKFILES)))'#010+ @@ -1503,7 +1503,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'override INST','ALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+ + 'overr','ide INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+ 'EFILES))'#010+ 'endif'#010+ #010+ @@ -1512,7 +1512,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ - ' -$(UPXPROG) $(INST','ALLEXEFILES)'#010+ + ' -$(UPXPROG',') $(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ @@ -1520,7 +1520,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ - '# a safety check is done if Makefile.f','pc is available'#010+ + '# a safety check is done if Ma','kefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+ @@ -1529,14 +1529,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ - 'ifdef IN','STALLPPUFILES'#010+ + 'endif'#010, + 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FULLNAME))',',)'#010+ + 'ifneq ($(wildcard $(LIB_FU','LLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ @@ -1545,15 +1545,15 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL_DATADIR)'#010+ - ' ',' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ + ' $(MKDIR) $(INSTALL_DA','TADIR)'#010+ + ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMP','LEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distclean,$(TARG','ET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ @@ -1561,7 +1561,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLED','IRS)) $(INSTALL_'+ + ' $(COPYTREE) $(addsuffix /*,$(TARGET_','EXAMPLEDIRS)) $(INSTALL_'+ 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ @@ -1570,9 +1570,9 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Dist Install'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_distinstall'#010+ + '.PHONY: fpc_distinstal','l'#010+ #010+ - 'fpc_d','istinstall: install exampleinstall'#010+ + 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ '[zipinstallrules]'#010+ @@ -1580,7 +1580,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourcein','stall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinstall fpc_zip','sourceinstall fpc_zipexampleinstall'#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+ @@ -1588,7 +1588,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ - 'PACKDIR=/tmp/fpc-pack',#010+ + 'PACKDIR=/tmp/','fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1603,8 +1603,8 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ - 'ifdef DIST_ZIPTARGET'#010+ - 'ZIPT','ARGET=DIST_ZIPTARGET'#010+ + 'ifdef DIST_ZIPTAR','GET'#010+ + 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ 'endif'#010+ @@ -1622,7 +1622,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#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 separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ @@ -1631,14 +1631,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ - '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD_C','DPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + '# Create commands to create the zip/tar file'#010, + 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(DIST_D','ESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ + 'ZIPDESTFILE:=','$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ 'endif'#010+ @@ -1646,20 +1646,20 @@ const fpcmakeini : array[0..182,1..240] of char=( 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ - ' $','(DEL) $(ZIPDESTFILE)'#010+ + ' ',' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCM','D_ZIP))" >> $(ZIPWRAPPE'+ + ' $(ECHOREDIR) -e "$(subst \,\\',',$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER',')'#010+ + ' echo $(ZIPCMD_CDBASE) >> $(ZI','PWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -1672,9 +1672,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zipsourceinstall:'#010+ - ' ',' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'+ - #010+ + 'fpc_zipsourceinst','all:'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ @@ -1682,7 +1681,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPT','ARGET=distinstall'#010+ + ' $(MAKE) fpc_zipinst','all ZIPTARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ @@ -1690,9 +1689,9 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclean',#010+ #010+ - 'ifdef ','EXEFILES'#010+ + 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ 'endif'#010+ @@ -1702,12 +1701,12 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(PPUEXT','),$(OEXT),$(CLEANPPUFILE'+ + 'override CLEANPPULINKFILES:=$(subst ','$(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES)))'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(addprefix ','$(UNITTARGETDIRPR'+ + 'override CLEANPPULINKFILES:=$(wildcard $(ad','dprefix $(UNITTARGETDIRPR'+ 'EFIX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ @@ -1719,7 +1718,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DE','L) $(CLEANPPULINKFILES)'#010+ + ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -1728,16 +1727,16 @@ const fpcmakeini : array[0..182,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ - 'e','ndif'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FUL','LNAME)'#010+ + 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ #010+ 'fpc_distclean: clean'#010+ #010+ '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ - '# set if targetdir or unittargetdir is specified'#010+ - 'i','fdef COMPILER_UNITTARGETDIR'#010+ + '# set if targetdir or unittargetdir is spe','cified'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ @@ -1745,8 +1744,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT)',' *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATI','CL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ @@ -1756,7 +1755,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '##################','##################################################'+ + '##########','##########################################################'+ '#'#010+ '# Base info rules'#010+ '#####################################################################'#010+ @@ -1767,87 +1766,87 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ - ' @$(E','CHO) == Package info =='#010+ + ' ',' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) FPC..........',' $(FPC)'#010+ + ' @$(ECHO) FPC..','........ $(FPC)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ - ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ - ' ',' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ + ' @$(ECHO) Target OS.... $(OS_TAR','GET)'#010+ + ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ - ' @$(ECHO)'#010+ - ' ',' @$(ECHO) Basedir......... $(BASEDIR)'#010+ + ' @$(EC','HO)'#010+ + ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO) PackagesDir..... $(PACKAGESDIR',')'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ - ' @$(ECHO) Ld.......','. $(LD)'#010+ + ' @$(ECHO) L','d........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' @$(ECHO) GInstall..',' $(GINSTALL)'#010+ + ' @$(ECHO) GI','nstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) Upx....... $(UPXP','ROG)'#010+ + ' @$(ECHO) Upx......','. $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ - ' @','$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ + ' ',' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ - ' ','@$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010, + ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install Units....... $(IN','STALL_UNITS)'#010+ + ' @$(ECHO) Install Units....','... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipPrefix............ $(ZIPPREF','IX)'#010+ + ' @$(ECHO) ZipPrefix............ $','(ZIPPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ - ' @$(ECHO) Install binary dir... $(INS','TALL_BINDIR)'#010+ + ' @$(ECHO) Install binary dir.','.. $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ - ' @$(ECHO) Install doc dir...... $(INSTALL','_DOCDIR)'#010+ + ' @$(ECHO) Install doc dir...... $','(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ - ' @$(ECHO) Dist zip name......','.. $(DIST_ZIPNAME)'#010+ + ' @$(ECHO) Dist zip na','me........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ @@ -1857,14 +1856,14 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '.PHONY: fpc_info'#010+ #010+ - 'fpc_info: $(INFORUL','ES)'#010+ + 'fpc_info: $','(INFORULES)'#010+ #010+ '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_ma','kefile_su'+ + '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub','1 fpc_makefile_su'+ 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ @@ -1876,7 +1875,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ 'endif'#010+ - 'ifdef TARGET','_EXAMPLEDIRS'#010+ + 'ifde','f TARGET_EXAMPLEDIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ @@ -1884,7 +1883,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ 'EXAMPLEDIRS))'#010+ #010+ - 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile','_sub2'#010+ + 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_','makefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ @@ -1893,7 +1892,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Local Makefile'#010+ '#####################################################################'#010+ #010+ - 'ifneq ($(wil','dcard fpcmake.loc),)'#010+ + 'ifne','q ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -1904,7 +1903,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '#############','#######################################################'+ + '#####','###############################################################'+ '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ @@ -1914,7 +1913,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(OS_TARGET),win32)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLATFORM=gt','k'#010+ + 'LCL_PLA','TFORM=gtk'#010+ 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ @@ -1926,8 +1925,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override LCLDIR=wrong'#010+ - 'en','dif'#010+ + 'override LCLDIR=','wrong'#010+ + 'endif'#010+ #010+ '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ @@ -1937,8 +1936,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Check for development version'#010+ - 'ifeq (','$(LCLDIR),wrong)'#010+ + '# Check for development versio','n'#010+ + 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ @@ -1946,8 +1945,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Check for release version'#010+ - 'ifeq (','$(LCLDIR),wrong)'#010+ + '# Check for release versio','n'#010+ + 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ @@ -1956,20 +1955,20 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNIT','DIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ + 'override',' LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ 'LDIR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQU','IRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'overr','ide REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '############################################################','########'+ + '####################################################','################'+ '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ @@ -1980,7 +1979,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) L','CL Unit dir......... $(LCLUNITDIR)'#010+ + ' @$(','ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 8ffd57e5b0..2c0cc30390 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -1225,11 +1225,11 @@ endif override COMPILER:=$(FPC) $(FPCOPT) # also call ppas if with command option -s -# but only if the OS_SOURCE and OS_TARGET are equal +# but only if the FULL_SOURCE and FULL_TARGET are equal ifeq (,$(findstring -s ,$(COMPILER))) EXECPPAS= else -ifeq ($(OS_SOURCE),$(OS_TARGET)) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) EXECPPAS:=@$(PPAS) endif endif