|
|
@@ -1832,7 +1832,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
|
|
|
'ifneq ($(SHARED_BUILD),n)'#010+
|
|
|
' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
|
|
|
- 'o$(SHARED_FULLNAME) -d$','(COMPILER_UNITTARGETDIR)'#010+
|
|
|
+ 'o$(SHARED_FULLNAME) -d$','(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
|
|
|
'endif'#010+
|
|
|
'else'#010+
|
|
|
' @$(ECHO) Shared Libraries not supported'#010+
|
|
|
@@ -1841,9 +1841,9 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'fpc_shared_install:'#010+
|
|
|
'ifneq ($(SHARED_BUILD),n)'#010+
|
|
|
'ifneq ($(SHARED_LIBUNITS),)'#010+
|
|
|
- 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
|
|
|
- ' $','(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+
|
|
|
- 'STALL_SHAREDDIR)'#010+
|
|
|
+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FU','LLNAME)),)'#010+
|
|
|
+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
|
|
|
+ 'ALL_SHAREDDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1851,7 +1851,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'[installrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Install rules'#010+
|
|
|
- '############################################','########################'+
|
|
|
+ '########################','############################################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
|
|
|
@@ -1861,37 +1861,37 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALL_BUILDUNIT'#010+
|
|
|
- 'override INSTALLPPUFILES:=$(filter-out',' $(INSTALL_BUILDUNIT)$(PPUEXT)'+
|
|
|
+ 'override INSTALLPP','UFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT)'+
|
|
|
',$(INSTALLPPUFILES))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
|
'# Avoid getting the same name twice as some install EXE fail'#010+
|
|
|
'# in this case, happends for instance for OS/2 target'#010+
|
|
|
- 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(S','TATICLIBPREFIX)-$(STATI'+
|
|
|
+ 'ifneq ($(IMPORTLIBPREFIX)','-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATI'+
|
|
|
'CLIBEXT))'#010+
|
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
|
'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+
|
|
|
- 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)',')'+
|
|
|
+ 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT','),$(INSTALLPPUFILES))'+
|
|
|
') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
|
|
|
'NSTALLPPUFILES)))'#010+
|
|
|
'else'#010+
|
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
|
- 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+
|
|
|
- 'ATICLI','BPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
|
|
|
+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(','addprefix $('+
|
|
|
+ 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
|
|
|
')'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
|
|
|
'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
|
|
|
- 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+
|
|
|
- 'override IN','STALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+
|
|
|
- 'LPPUFILENAMES))'#010+
|
|
|
+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULIN','KFILES))'#010+
|
|
|
+ 'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+
|
|
|
+ 'PUFILENAMES))'#010+
|
|
|
'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+
|
|
|
'FIX),$(INSTALLPPULINKFILENAMES)))'#010+
|
|
|
'endif'#010+
|
|
|
'# Implicitly install Package.fpc'#010+
|
|
|
- 'override INSTALL_CREATEP','ACKAGEFPC=1'#010+
|
|
|
+ 'over','ride INSTALL_CREATEPACKAGEFPC=1'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
|
@@ -1902,31 +1902,31 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_install: all $(INSTALLTARGET)'#010+
|
|
|
- 'ifdef INSTALLEXEFILES'#010+
|
|
|
- ' $(MKDIR',') $(INSTALL_BINDIR)'#010+
|
|
|
+ 'ifdef INSTALLEXEF','ILES'#010+
|
|
|
+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+
|
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
|
'endif'#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+
|
|
|
+ '# a safety check ','is done if Makefile.fpc is available'#010+
|
|
|
'ifdef PACKAGE_VERSION'#010+
|
|
|
'ifneq ($(wildcard Makefile.fpc),)'#010+
|
|
|
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
|
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
- ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
|
|
+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDI','R)'#010+
|
|
|
+ 'endif'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'endif',#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+
|
|
|
+ 'endif',#010+
|
|
|
+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
|
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
|
|
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
@@ -1935,7 +1935,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef INSTALL_FILES'#010+
|
|
|
- ' $(MKDIR) $(INS','TALL_DATADIR)'#010+
|
|
|
+ ' ',' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
|
|
' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1943,7 +1943,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
|
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
|
|
|
#010+
|
|
|
- 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET',') $(addsuffix _distclean,$'+
|
|
|
+ 'fpc_exampleinstall: $(','EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$'+
|
|
|
'(TARGET_EXAMPLEDIRS))'#010+
|
|
|
'ifdef HASEXAMPLES'#010+
|
|
|
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
|
|
|
@@ -1951,15 +1951,15 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'ifdef EXAMPLESOURCEFILES'#010+
|
|
|
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
|
- ' $(COP','YTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+
|
|
|
- 'EXAMPLEDIR)'#010+
|
|
|
+ 'ifdef TARGET_EXAMP','LEDIRS'#010+
|
|
|
+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
|
|
|
+ 'AMPLEDIR)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'[distinstallrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Dist Install'#010+
|
|
|
- '##############################################################','######'+
|
|
|
+ '##########################################','##########################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_distinstall'#010+
|
|
|
@@ -1970,15 +1970,16 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'[zipinstallrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Zip'#010+
|
|
|
- '#####################################################################'#010,
|
|
|
+ '##################################################','##################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_zipinstall fpc_zipsourceinstall 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+
|
|
|
'ifndef PACKDIR'#010+
|
|
|
- 'ifndef inUnix'#010+
|
|
|
- 'PACKDIR=$(BASEDIR)','/../fpc-pack'#010+
|
|
|
+ 'ifndef inUni','x'#010+
|
|
|
+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
|
|
|
'else'#010+
|
|
|
'PACKDIR=/tmp/fpc-pack'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1993,8 +1994,8 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'ifndef FULLZIPNAME'#010+
|
|
|
- 'FULLZIPNAME=$(ZIPCRO','SSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
|
|
|
+ 'ifndef FULLZIPNAME'#010,
|
|
|
+ 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# ZipTarget'#010+
|
|
|
@@ -2008,10 +2009,10 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
#010+
|
|
|
'# Use tar by default under linux'#010+
|
|
|
'ifndef USEZIP'#010+
|
|
|
- 'ifdef inUnix'#010+
|
|
|
+ 'ifdef inUni','x'#010+
|
|
|
'USETAR=1'#010+
|
|
|
'endif'#010+
|
|
|
- 'end','if'#010+
|
|
|
+ 'endif'#010+
|
|
|
#010+
|
|
|
'# Use a wrapper script by default for Os/2'#010+
|
|
|
'ifndef inUnix'#010+
|
|
|
@@ -2022,7 +2023,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'# the path separator'#010+
|
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
|
- 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_D','ESTDIR)/fpczip$(SRCBATCHEXT)'+
|
|
|
+ 'ZIPWRAPPER=$(subst /',',$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+
|
|
|
')'#010+
|
|
|
'else'#010+
|
|
|
'ZIPPATHSEP=/'#010+
|
|
|
@@ -2031,30 +2032,30 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'# 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)/$(FULLZIPNAME)$(TAREXT)'#010+
|
|
|
+ 'ifdef USETAR',#010+
|
|
|
+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
|
|
|
'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
|
|
|
'else'#010+
|
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
|
|
|
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
|
|
- 'TFILE) *'#010+
|
|
|
+ 'TFILE)',' *'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'fpc_zipins','tall:'#010+
|
|
|
+ 'fpc_zipinstall:'#010+
|
|
|
' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
|
' $(MKDIR) $(DIST_DESTDIR)'#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))" > $(ZIPWRAP'+
|
|
|
- 'PER)'#010+
|
|
|
+ 'ifneq ($','(ECHOREDIR),echo)'#010+
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
|
|
|
+ 'R)'#010+
|
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
|
|
|
#010+
|
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
|
|
|
'ER)'#010+
|
|
|
- 'else'#010+
|
|
|
- ' echo $(ZIPC','MD_CDPACK) > $(ZIPWRAPPER)'#010+
|
|
|
+ 'else',#010+
|
|
|
+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
|
|
|
' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2062,9 +2063,9 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
' /bin/sh $(ZIPWRAPPER)'#010+
|
|
|
'else'#010+
|
|
|
'ifdef RUNBATCH'#010+
|
|
|
- ' $(RUNBATCH) $(ZIPWRAPPER)'#010+
|
|
|
+ ' $(RUNBATCH) $(ZIPWRAPPER)',#010+
|
|
|
'else'#010+
|
|
|
- ' $(ZIPW','RAPPER)'#010+
|
|
|
+ ' $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
' $(DEL) $(ZIPWRAPPER)'#010+
|
|
|
@@ -2074,7 +2075,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
|
#010+
|
|
|
'fpc_zipsourceinstall:'#010+
|
|
|
- ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(','Z'+
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=source','install ZIPSUFFIX=$(Z'+
|
|
|
'IPSOURCESUFFIX)'#010+
|
|
|
#010+
|
|
|
'fpc_zipexampleinstall:'#010+
|
|
|
@@ -2084,10 +2085,10 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_zipdistinstall:'#010+
|
|
|
- ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=distins','tall'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
- '[cleanrules]'#010,
|
|
|
+ '[cleanrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Clean rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2095,15 +2096,15 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
|
#010+
|
|
|
'ifdef EXEFILES'#010+
|
|
|
- 'override CLEANEXEFILES:=','$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
|
|
|
+ 'over','ride CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
|
|
|
'ES))'#010+
|
|
|
'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+
|
|
|
'GFILES))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef CLEAN_PROGRAMS'#010+
|
|
|
- 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
|
|
|
- 'XEEXT), $(CLEA','N_PROGRAMS)))'#010+
|
|
|
+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuff','ix $'+
|
|
|
+ '(EXEEXT), $(CLEAN_PROGRAMS)))'#010+
|
|
|
'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+
|
|
|
'$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2112,18 +2113,18 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'ifdef CLEANPPUFILES'#010+
|
|
|
- 'override',' CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
|
|
|
- 'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+
|
|
|
- 'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+
|
|
|
- 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEX','T),$(STATICLIBEXT),$(CLEANPP'+
|
|
|
- 'UFILES)))'#010+
|
|
|
+ 'ifdef CL','EANPPUFILES'#010+
|
|
|
+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
|
|
+ ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLI'+
|
|
|
+ 'BPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addpre'+
|
|
|
+ 'fix $(IMPORTLIBPRE','FIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+
|
|
|
+ 'ILES)))'#010+
|
|
|
'ifdef DEBUGSYMEXT'#010+
|
|
|
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
|
|
|
'UFILES))'#010+
|
|
|
'endif'#010+
|
|
|
'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+
|
|
|
- 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREF','IX),$(CLEANPPU'+
|
|
|
+ 'override CLEANPPUFILES=$(addprefix',' $(UNITTARGETDIRPREFIX),$(CLEANPPU'+
|
|
|
'FILENAMES))'#010+
|
|
|
'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+
|
|
|
'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+
|
|
|
@@ -2131,17 +2132,17 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_clean: $(CLEANTARGET)'#010+
|
|
|
- 'ifdef CLEANEXEFILES'#010+
|
|
|
- ' ','-$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
+ 'ifdef CL','EANEXEFILES'#010+
|
|
|
+ ' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'# DELTREE instead of DEL because on Mac OS X these are directories'#010+
|
|
|
'ifdef CLEANEXEDBGFILES'#010+
|
|
|
' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef CLEANPPUFILES'#010+
|
|
|
- ' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
+ ' -$(DEL) $(CLEANPPUFILES)'#010,
|
|
|
'endif'#010+
|
|
|
- 'ifneq ($(CLEAN','PPULINKFILES),)'#010+
|
|
|
+ 'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef CLEANRSTFILES'#010+
|
|
|
@@ -2150,13 +2151,13 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'ifdef CLEAN_FILES'#010+
|
|
|
' -$(DEL) $(CLEAN_FILES)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef LIB_NAME'#010+
|
|
|
- ' -$(DEL) ','$(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
|
+ 'ifdef LIB_N','AME'#010+
|
|
|
+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
|
'endif'#010+
|
|
|
' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+
|
|
|
' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
|
|
|
'ipt.res *_link.res'#010+
|
|
|
- ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$','(BATCHEXT) ppaslink$('+
|
|
|
+ ' -$(DEL) $(PPAS) *_p','pas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+
|
|
|
'BATCHEXT)'#010+
|
|
|
#010+
|
|
|
'fpc_cleanall: $(CLEANTARGET)'#010+
|
|
|
@@ -2167,8 +2168,8 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'ifdef CLEANPPUFILES'#010+
|
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
|
- ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
+ 'ifneq ($(CLE','ANPPULINKFILES),)'#010+
|
|
|
+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef CLEANRSTFILES'#010+
|
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
|
@@ -2177,23 +2178,23 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'ifdef CLEAN_FILES'#010+
|
|
|
' -$(DEL) $(CLEAN_FILES)'#010+
|
|
|
'endif'#010+
|
|
|
- ' -$(DELTREE) units'#010+
|
|
|
- ' -$(DELTRE','E) bin'#010+
|
|
|
+ ' -$(DELTREE) uni','ts'#010+
|
|
|
+ ' -$(DELTREE) bin'#010+
|
|
|
' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+
|
|
|
'$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
|
'ifneq ($(PPUEXT),.ppu)'#010+
|
|
|
' -$(DEL) *.o *.ppu *.a'#010+
|
|
|
'endif'#010+
|
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
|
- ' -$(DEL) fpcmade.* P','ackage.fpc *.fpm'#010+
|
|
|
+ ' ',' -$(DEL) fpcmade.* Package.fpc *.fpm'#010+
|
|
|
' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
|
|
|
'ipt.res *_link.res'#010+
|
|
|
' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
|
|
|
'TCHEXT)'#010+
|
|
|
'ifdef AOUTEXT'#010+
|
|
|
- ' -$(DEL) *$(AOUTEXT)'#010+
|
|
|
+ ' -$(DEL) *$(AOU','TEXT)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef DE','BUGSYMEXT'#010+
|
|
|
+ 'ifdef DEBUGSYMEXT'#010+
|
|
|
' -$(DEL) *$(DEBUGSYMEXT)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef LOCALFPMAKEBIN'#010+
|
|
|
@@ -2205,7 +2206,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[baseinforules]'#010+
|
|
|
- '########################################################','############'+
|
|
|
+ '####################################','################################'+
|
|
|
'#'#010+
|
|
|
'# Base info rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2216,92 +2217,92 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_baseinfo:'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) == Package info =='#010+
|
|
|
- ' @$(EC','HO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
|
+ ' @$(ECHO) == Package i','nfo =='#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 Version.','. $(FPC_VERSION)'#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_SO','URCE)'#010+
|
|
|
+ ' @$(ECHO) Ful','l Source.. $(FULL_SOURCE)'#010+
|
|
|
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
|
|
|
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
|
|
|
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
|
|
|
' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) == Director','y info =='#010+
|
|
|
+ ' @','$(ECHO) == Directory info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
|
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
|
|
- ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010,
|
|
|
+ ' @$(ECHO) CrossBinDir.','.... $(CROSSBINDIR)'#010+
|
|
|
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#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) == Tools info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) As........ $(AS)'#010+
|
|
|
' @$(ECHO) Ld........ $(LD)'#010+
|
|
|
' @$(ECHO) Ar........ $(AR)'#010+
|
|
|
' @$(ECHO) Rc........ $(RC)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) Mv........ $(MVPROG)'#010+
|
|
|
- ' ',' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
|
+ ' @$(ECHO) Mv..','...... $(MVPROG)'#010+
|
|
|
+ ' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
|
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
|
' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
|
' @$(ECHO) Shell..... $(SHELL)'#010+
|
|
|
- ' @$(ECHO) Date...... $(DATE)'#010+
|
|
|
- ' @$(E','CHO) FPCMake... $(FPCMAKE)'#010+
|
|
|
+ ' @$(ECHO) Date...... ','$(DATE)'#010+
|
|
|
+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#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 Loaders........ $','(TARGET_LOADERS)'#010+
|
|
|
+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#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 Dirs........... ','$(TARGET_DIRS)'#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_FILE','S)'#010+
|
|
|
+ ' @$(ECHO) Clean Files..','....... $(CLEAN_FILES)'#010+
|
|
|
' @$(ECHO)'#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) ',' DateStr.............. $(DATESTR)'#010+
|
|
|
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
|
|
|
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
|
|
|
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
|
|
|
- ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
|
- ' @$(','ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
|
|
|
+ ' @$(ECHO) ZipSuffix............ $(ZI','PSUFFIX)'#010+
|
|
|
+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
|
|
|
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
|
|
|
- ' @$(ECHO) Install binary dir... $(INSTALL_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 example dir.. $(INSTALL_EXAMPLEDIR)'#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_ZIP','NAME)'#010+
|
|
|
+ ' @$(ECHO) Dist zip nam','e........ $(DIST_ZIPNAME)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
|
'[inforules]'#010+
|
|
|
@@ -2311,15 +2312,15 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_info'#010+
|
|
|
#010+
|
|
|
- 'fpc_info: $(INFORULES)'#010+
|
|
|
+ 'fpc_info: $(','INFORULES)'#010+
|
|
|
#010+
|
|
|
- '[makefil','erules]'#010+
|
|
|
+ '[makefilerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Rebuild Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
|
|
|
- ' \',#010+
|
|
|
+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1',' fpc_makefile_su'+
|
|
|
+ 'b2 \'#010+
|
|
|
' fpc_makefile_dirs'#010+
|
|
|
#010+
|
|
|
'fpc_makefile:'#010+
|
|
|
@@ -2330,7 +2331,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
|
|
|
'T_DIRS))'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef TARGET_EXAMPLEDIRS'#010,
|
|
|
+ 'ifdef',' TARGET_EXAMPLEDIRS'#010+
|
|
|
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
|
|
|
'T_EXAMPLEDIRS))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2338,16 +2339,16 @@ const fpcmakeini : array[0..247,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_m','akefile_sub2'#010+
|
|
|
#010+
|
|
|
- 'fpc_ma','kefiles: fpc_makefile fpc_makefile_dirs'#010+
|
|
|
+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
|
|
|
#010+
|
|
|
'[localmakefile]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Local Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- 'ifneq ($(wildcard fpcmake','.loc),)'#010+
|
|
|
+ 'ifneq',' ($(wildcard fpcmake.loc),)'#010+
|
|
|
'include fpcmake.loc'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -2358,7 +2359,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
'[lclrules]'#010+
|
|
|
- '##########################','##########################################'+
|
|
|
+ '######','##############################################################'+
|
|
|
'#'#010+
|
|
|
'# LCL Rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2366,9 +2367,9 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'# LCL Platform'#010+
|
|
|
'ifndef LCL_PLATFORM'#010+
|
|
|
'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+
|
|
|
- 'LCL_PLATFORM=win32'#010+
|
|
|
+ 'LCL_PLATFO','RM=win32'#010+
|
|
|
'else'#010+
|
|
|
- 'LCL_PL','ATFORM=gtk'#010+
|
|
|
+ 'LCL_PLATFORM=gtk'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
'export LCL_PLATFORM'#010+
|
|
|
@@ -2378,9 +2379,9 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
|
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'endif'#010,
|
|
|
'else'#010+
|
|
|
- 'override LCLDIR','=wrong'#010+
|
|
|
+ 'override LCLDIR=wrong'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Check if the default LCLDIR is correct'#010+
|
|
|
@@ -2391,7 +2392,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Check for development versi','on'#010+
|
|
|
+ '# Check f','or development version'#010+
|
|
|
'ifeq ($(LCLDIR),wrong)'#010+
|
|
|
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
|
|
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
|
|
@@ -2400,7 +2401,7 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Check for release versi','on'#010+
|
|
|
+ '# Che','ck for release version'#010+
|
|
|
'ifeq ($(LCLDIR),wrong)'#010+
|
|
|
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
|
|
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
|
|
|
@@ -2409,21 +2410,21 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Generate dirs'#010+
|
|
|
- 'overrid','e LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+
|
|
|
- 'DIR)/units)'#010+
|
|
|
+ '# G','enerate dirs'#010+
|
|
|
+ 'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+
|
|
|
+ 'R)/units)'#010+
|
|
|
'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+
|
|
|
'ts $(LCLDIR)/components)'#010+
|
|
|
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
|
|
|
#010+
|
|
|
- '# Add LCL dirs to paths'#010+
|
|
|
- 'overri','de REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
|
|
|
+ '# Add LCL ','dirs to paths'#010+
|
|
|
+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
|
|
|
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
|
|
|
#010+
|
|
|
'[lclinforules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# LCL Info rules'#010+
|
|
|
- '#####################################################','###############'+
|
|
|
+ '#################################','###################################'+
|
|
|
'#'#010+
|
|
|
'override INFORULES+=lclinfo'#010+
|
|
|
#010+
|
|
|
@@ -2433,22 +2434,21 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
' @$(ECHO) == LCL info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
|
|
|
- ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
|
|
|
- ' @$(E','CHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
|
|
|
+ ' @$(ECHO) LCLDIR............... $(','LCLDIR)'#010+
|
|
|
+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
|
|
|
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
|
'[fpmakeprerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
- '# fpmake prerules'#010+
|
|
|
- '################','####################################################'+
|
|
|
- '#'#010+
|
|
|
+ '# fpmake preru','les'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+
|
|
|
'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+
|
|
|
'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+
|
|
|
#010+
|
|
|
- '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+
|
|
|
- 'd --cpu ','parameters'#010+
|
|
|
+ '# Convert the OS_TARGET and CPU_TARGET options to fpma','ke'#039's --os '+
|
|
|
+ 'and --cpu parameters'#010+
|
|
|
'ifdef OS_TARGET'#010+
|
|
|
'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2457,13 +2457,13 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Get the location of the bootstrap-fpmkunit units'#010+
|
|
|
- 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip ','$(wi'+
|
|
|
+ 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Ma','kefile.fpc,,$(strip $(wi'+
|
|
|
'ldcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+
|
|
|
'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+
|
|
|
'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+
|
|
|
')'#010+
|
|
|
- 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+
|
|
|
- 'FPMKUNIT_S','RC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+
|
|
|
+ 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_','FPMKUNIT)'#010+
|
|
|
+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+
|
|
|
'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -2472,30 +2472,30 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'[fpmakerules]'#010+
|
|
|
- '###########################################','#########################'+
|
|
|
+ '#######################','#############################################'+
|
|
|
'#'#010+
|
|
|
'# fpmake rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+
|
|
|
'pleinstall'#010+
|
|
|
#010+
|
|
|
- '# Do not pass the Makefile'#039's unit and binary t','arget locations. f'+
|
|
|
- 'pmake uses it'#039's own.'#010+
|
|
|
+ '# Do not pass the Makefile',#039's unit and binary target locations. fpm'+
|
|
|
+ 'ake uses it'#039's own.'#010+
|
|
|
'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+
|
|
|
'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+
|
|
|
'# Compose general fpmake-parameters'#010+
|
|
|
'ifdef FPMAKEOPT'#010+
|
|
|
'FPMAKE_OPT+=$(FPMAKEOPT)'#010+
|
|
|
'endif'#010+
|
|
|
- 'FPMAKE_OPT+=--localunitdir','=$(FPCDIR)'#010+
|
|
|
+ 'FPMAKE','_OPT+=--localunitdir=$(FPCDIR)'#010+
|
|
|
'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+
|
|
|
'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+
|
|
|
'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+
|
|
|
'FPMAKE_OPT+=--compiler=$(FPC)'#010+
|
|
|
'FPMAKE_OPT+=-bu'#010+
|
|
|
#010+
|
|
|
- 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+
|
|
|
- 'ifdef UNIXH','ier'#010+
|
|
|
+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_','UNITDIR)'#010+
|
|
|
+ 'ifdef UNIXHier'#010+
|
|
|
'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+
|
|
|
'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+
|
|
|
'ON)'#010+
|
|
|
@@ -2504,40 +2504,40 @@ const fpcmakeini : array[0..247,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'override ALLTARGET+=fpc_fpmake'#010+
|
|
|
- 'override INSTALLTARGET+=','fpc_fpmake_install'#010+
|
|
|
+ 'over','ride INSTALLTARGET+=fpc_fpmake_install'#010+
|
|
|
'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+
|
|
|
'# If no fpmake exists and (dist)clean is called, do not try to build f'+
|
|
|
'pmake, it will'#010+
|
|
|
'# most often fail because the dependencies are cleared.'#010+
|
|
|
- '# In case of a clean, s','imply do nothing'#010+
|
|
|
+ '# I','n case of a clean, simply do nothing'#010+
|
|
|
'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+
|
|
|
'override CLEANTARGET+=fpc_fpmake_clean'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+
|
|
|
' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+
|
|
|
- 'T=,$(FPMAKE_BUILD_OPT))'#010+
|
|
|
+ 'T=,$(FPMAKE_BUI','LD_OPT))'#010+
|
|
|
#010+
|
|
|
- '$(FPMAKEBI','N): fpmake.pp $(FPMKUNIT_PPU)'#010+
|
|
|
+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+
|
|
|
' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+
|
|
|
'IR)) $(FPMAKE_BUILD_OPT)'#010+
|
|
|
#010+
|
|
|
'fpc_fpmake: $(FPMAKEBIN)'#010+
|
|
|
' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+
|
|
|
#010+
|
|
|
- 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+
|
|
|
- ' ',' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
|
|
|
+ 'fpc_fpmake_clean',': $(FPMAKEBIN)'#010+
|
|
|
+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
|
|
|
#010+
|
|
|
'fpc_fpmake_install: $(FPMAKEBIN)'#010+
|
|
|
' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+
|
|
|
'PT)'#010+
|
|
|
#010+
|
|
|
- '# This is not completely valid. Exampleinstall should only install the'+
|
|
|
- ' examples, while',#010+
|
|
|
+ '# This is not completely valid. Exampleinstall should only install',' t'+
|
|
|
+ 'he examples, while'#010+
|
|
|
'# fpmake -ie installs everything, including the examples. This also me'+
|
|
|
'ans that on'#010+
|
|
|
'# a distinstall fpmake install wil be called twice.'#010+
|
|
|
'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+
|
|
|
- ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_','INS'+
|
|
|
+ ' $(LOCALFPMAKEBIN) install -ie $(F','PMAKE_OPT) $(FPMAKE_INS'+
|
|
|
'TALL_OPT)'#010
|
|
|
);
|
florian