paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-25 03:55:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

* readded libfullname things which were lost after previous commit

Browse Source
This commit is contained in:
peter 2000-06-02 20:09:56 +00:00
parent afbf0b23f6
commit 9ed9c0e88c
2 changed files with 124 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
utils/fpcmake.inc
View File

@ -1,7 +1,7 @@
{$ifdef Delphi} {$ifdef Delphi}
const fpcmakeini : array[0..121] of string[240]=( const fpcmakeini : array[0..122] of string[240]=(
{$else Delphi} {$else Delphi}
const fpcmakeini : array[0..121,1..240] of char=( const fpcmakeini : array[0..122,1..240] of char=(
{$endif Delphi} {$endif Delphi}
';'#010+ ';'#010+
'; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@ -1060,50 +1060,50 @@ const fpcmakeini : array[0..121,1..240] of char=(
#010+ #010+
'.PHONY: fpc_smart fpc_shared'#010+ '.PHONY: fpc_smart fpc_shared'#010+
#010+ #010+
'# Defau','lt sharedlib units are all unit objects'#010+ 'ifdef L','IBVERSION'#010+
'LIBFULLNAME=$(LIBNAME).$(LIBVERSION)'#010+
'else'#010+
'LIBFULLNAME=$(LIBNAME)'#010+
'endif'#010+
#010+
'# Default sharedlib units are all unit objects'#010+
'ifndef SHAREDLIBUNITOBJECTS'#010+ 'ifndef SHAREDLIBUNITOBJECTS'#010+
'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+ 'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_smart:'#010+ 'fpc_smart:'#010+
' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ ' $(MAKE) all LINKSMAR','T=1 CREATESMART=1'#010+
#010+ #010+
'fpc_shared: all'#010+ 'fpc_shared: all'#010+
'ifdef inlinux'#010+ 'ifdef inlinux'#010+
'ifndef LIBNAME'#010+ 'ifndef LIBNAME'#010+
' @$(ECHO) "LIBNAME',' not set"'#010+ ' @$(ECHO) "LIBNAME not set"'#010+
'else'#010+ 'else'#010+
' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+ ' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBFULLNAME)'#010+
'endif'#010+ 'endif'#010+
'else'#010+ 'else'#010+
' @$(ECHO) "Shared Libraries not supported"'#010+ ' @$(ECHO) "Shared Libraries not supported"'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
#010+ #010+
'[installrules]'#010+ '[instal','lrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Install rules',#010+ '# Install rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_showinstall fpc_install'#010+ '.PHONY: fpc_showinstall fpc_install'#010+
#010+ #010+
'ifdef EXTRAINSTALLUNITS'#010+ 'ifdef EXTRAINSTALLUNITS'#010+
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+ 'override INSTA','LLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS)'+
')'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef INSTALLPPUFILES'#010+ 'ifdef INSTALLPPUFILES'#010+
'ifdef PP','UFILES'#010+ 'ifdef PPUFILES'#010+
'ifdef inlinux'#010+
'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+ 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
'ifdef LIBNAME'#010+
'INSTALLPPULIBFILES=$(LIBNAME)'#010+
'endif'#010+
'else'#010+ 'else'#010+
'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+ 'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLP','P'+
'endif'#010+ 'UFILES)))'#010+
'else'#010+
'INSTALLPPULINKFILES:=$(wi','ldcard $(subst $(PPUEXT),$(OEXT),$(INSTALLP'+
'PUFILES)))'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1113,15 +1113,17 @@ const fpcmakeini : array[0..121,1..240] of char=(
'S))'#010+ 'S))'#010+
'endif'#010+ 'endif'#010+
'ifdef INSTALLPPUFILES'#010+ 'ifdef INSTALLPPUFILES'#010+
' @$(','ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUF'+ ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/',',$(INSTALLPPUF'+
'ILES))'#010+ 'ILES))'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+ ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
'KFILES))'#010+ 'KFILES))'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(INSTALLPPULIBFILES),)'#010+ 'ifneq ($(wildcard $(LIBFULLNAME)),)'#010+
' @$(ECHO) -e $(addpre','fix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULI'+ ' @$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)'#010+
'BFILES))'#010+ 'ifdef inlinux'#010+
' ',' @$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)'#010+
'endif'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
'ifdef EXTRAINSTALLFILES'#010+ 'ifdef EXTRAINSTALLFILES'#010+
@ -1131,7 +1133,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
#010+ #010+
'fpc_install: $(INSTALLTARGET)'#010+ 'fpc_install: $(INSTALLTARGET)'#010+
'# Create UnitInstallFiles'#010+ '# Create UnitInstallFiles'#010+
'ifdef INSTALLEX','EFILES'#010+ 'ifdef INSTALLEXE','FILES'#010+
' $(MKDIR) $(BININSTALLDIR)'#010+ ' $(MKDIR) $(BININSTALLDIR)'#010+
'# Compress the exes if upx is defined'#010+ '# Compress the exes if upx is defined'#010+
'ifdef UPXPROG'#010+ 'ifdef UPXPROG'#010+
@ -1140,44 +1142,46 @@ const fpcmakeini : array[0..121,1..240] of char=(
' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
'endif'#010+ 'endif'#010+
'ifdef INSTALLPPUFILES'#010+ 'ifdef INSTALLPPUFILES'#010+
' $(MKDIR)',' $(UNITINSTALLDIR)'#010+ ' $(MKDIR) ','$(UNITINSTALLDIR)'#010+
' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+
' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(INSTALLPPULIBFILES),)'#010+ 'ifneq ($(wildcard $(LIBFULLNAME)),)'#010+
' $(MKDIR) $(LIBINSTALLDIR)'#010+ ' $(MKDIR) $(LIBINSTALLDIR',')'#010+
' ',' $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+ ' $(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)'#010+
'ifdef inlinux'#010+
' ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)'#010+
'endif'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
'ifdef EXTRAINSTALLFILES'#010+ 'ifdef EXTRAINSTALLFILES'#010+
' $(MKDIR) $(DATAINSTALLDIR)'#010+ ' $(MKDIR) $(DATAINSTALLDIR)'#010+
' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+ ' $(INSTALL) $(EXTRAINSTALLFILES',') $(DATAINSTALLDIR)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
#010+ #010+
'[sourceinstallrules]'#010+ '[sourceinstallrules]'#010+
'##########################','##########################################'+ '#####################################################################'#010+
'#'#010+
'# SourceInstall rules'#010+ '# SourceInstall rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_sourceinstall'#010+ '.PHONY: fpc_sourceinstall'#010+
#010+ #010+
'ifndef SOURCETOPDIR'#010+ 'i','fndef SOURCETOPDIR'#010+
'SOURCETOPDIR=$(BASEDIR)'#010+ 'SOURCETOPDIR=$(BASEDIR)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_sourceinstall: clean'#010, 'fpc_sourceinstall: clean'#010+
' $(MKDIR) $(SOURCEINSTALLDIR)'#010+ ' $(MKDIR) $(SOURCEINSTALLDIR)'#010+
' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+ ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+
#010+ #010+
#010+ #010+
'[zipinstallrules]'#010+ '[zipinstallrules]'#010+
'#####################################################################'#010+ '####################################################','################'+
'# Zip'#010+
'###################################################','#################'+
'#'#010+ '#'#010+
'# Zip'#010+
'#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_zipinstall'#010+ '.PHONY: fpc_zipinstall'#010+
#010+ #010+
@ -1186,13 +1190,13 @@ const fpcmakeini : array[0..121,1..240] of char=(
'PACKAGESUFFIX=$(OS_TARGET)'#010+ 'PACKAGESUFFIX=$(OS_TARGET)'#010+
'ifeq ($(OS_TARGET),go32v2)'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+
'PACKAGESUFFIX=go32'#010+ 'PACKAGESUFFIX=go32'#010+
'endif'#010+ 'endi','f'#010+
'ifeq ($(OS_TARGET),win32)'#010+ 'ifeq ($(OS_TARGET),win32)'#010+
'PACKAGESUFFIX=w32'#010+ 'PACKAGESUFFIX=w32'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Temporary path',' to pack a file'#010+ '# Temporary path to pack a file'#010+
'ifndef PACKDIR'#010+ 'ifndef PACKDIR'#010+
'ifndef inlinux'#010+ 'ifndef inlinux'#010+
'PACKDIR=$(BASEDIR)/pack_tmp'#010+ 'PACKDIR=$(BASEDIR)/pack_tmp'#010+
@ -1202,9 +1206,9 @@ const fpcmakeini : array[0..121,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
'# Maybe create default zipname from packagename'#010+ '# Maybe create default zipname from packagename'#010+
'ifndef ZIPNAME'#010+ 'ifn','def ZIPNAME'#010+
'ifdef PACKAGENAME'#010+ 'ifdef PACKAGENAME'#010+
'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKA','GESUFFIX)'#010+ 'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1217,37 +1221,38 @@ const fpcmakeini : array[0..121,1..240] of char=(
#010+ #010+
'fpc_zipinstall:'#010+ 'fpc_zipinstall:'#010+
'ifndef ZIPNAME'#010+ 'ifndef ZIPNAME'#010+
' @$(ECHO) "Please specify ZIPNAME!"'#010+ ' @$(ECHO) "Please spe','cify ZIPNAME!"'#010+
' @exit 1'#010+ ' @exit 1'#010+
'else'#010+ 'else'#010+
' $(MAKE) $(ZIPTARGET) PREFIXINST','ALLDIR=$(PACKDIR)'#010+ ' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
'ifdef USETAR'#010+ 'ifdef USETAR'#010+
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+ ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+ ' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+
'IPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+ 'IPNAME)$(TAREXT',') * ; cd $(BASEDIR)'#010+
'else'#010+ 'else'#010+
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
' ',' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIP'+ ' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
'NAME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+ 'ME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+
'endif'#010+ 'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+ ' $(DELTREE) $(PACKDIR)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
#010+ #010+
'[zipsourceinstallrules]'#010+ '[zipsourceinstallrule','s]'#010+
'.PHONY: fpc_zipsourceinstall'#010+ '.PHONY: fpc_zipsourceinstall'#010+
#010+ #010+
'fpc_zipsourceinstall:'#010+ 'fpc_zipsourceinstall:'#010+
' $(MAKE) fpc','_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX'+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=s'+
'=src'#010+ 'rc'#010+
#010+ #010+
#010+ #010+
'[cleanrules]'#010+ '[cleanrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Clean rules'#010+ '# Clean rules'#010+
'#####################################################################'#010+ '############','########################################################'+
'#'#010+
#010+ #010+
'.PHONY: fpc_clea','n fpc_cleanall fpc_distclean'#010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
#010+ #010+
'ifdef EXTRACLEANUNITS'#010+ 'ifdef EXTRACLEANUNITS'#010+
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+ 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
@ -1255,10 +1260,10 @@ const fpcmakeini : array[0..121,1..240] of char=(
#010+ #010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLEANPPUFILES'#010+
'ifdef PPUFILES'#010+ 'ifdef PPUFILES'#010+
'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+ 'CLEAN','PPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
'else'#010+ 'else'#010+
'CLEANPPULINKFILES:','=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFI'+ 'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
'LES)))'#010+ 'S)))'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1266,10 +1271,10 @@ const fpcmakeini : array[0..121,1..240] of char=(
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLEA','NPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+ ' -$(DEL) $(CLEANPPUFILES)'#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+
@ -1277,31 +1282,31 @@ const fpcmakeini : array[0..121,1..240] of char=(
'endif'#010+ 'endif'#010+
'ifdef EXTRACLEANFILES'#010+ 'ifdef EXTRACLEANFILES'#010+
' -$(DEL) $(EXTRACLEANFILES)'#010+ ' -$(DEL) $(EXTRACLEANFILES)'#010+
'endif'#010+ 'en','dif'#010+
'ifdef LIBNAME'#010+ 'ifdef LIBNAME'#010+
' -$(DEL) $(LIBNAME)'#010+ ' -$(DEL) $(LIBNAME) $(LIBFULLNAME)'#010+
'endif'#010+ 'endif'#010+
' -$(DEL) $(FPCMAD','E) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
'E)'#010+ #010+
#010+ #010+
'fpc_distclean: fpc_clean'#010+ 'fpc_distclean: fpc_clean'#010+
#010+ #010+
'fpc_cleanall: $(CLEANTARGET)'#010+ 'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+ ' -$(DEL) $(CLEANEXEF','ILES)'#010+
'endif'#010+ 'endif'#010+
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
'EXT) *$(','SHAREDLIBEXT) *$(PPLEXT)'#010+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+
' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
#010+ #010+
#010+ #010+
#010+ #010+
'[dependrules]'#010+ '[dependrules]'#010+
'#####################################################################'#010+ '#####','###############################################################'+
'# Depend rules'#010+
'##########','##########################################################'+
'#'#010+ '#'#010+
'# Depend rules'#010+
'#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_depend'#010+ '.PHONY: fpc_depend'#010+
#010+ #010+
@ -1310,27 +1315,27 @@ const fpcmakeini : array[0..121,1..240] of char=(
#010+ #010+
#010+ #010+
'[inforules]'#010+ '[inforules]'#010+
'#####################################################################'#010+ '###########','#########################################################'+
'# Info rules'#010+
'##################','##################################################'+
'#'#010+ '#'#010+
'# Info rules'#010+
'#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+ '.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+
'nfo \'#010+ 'nfo \'#010+
' fpc_dirinfo'#010+ ' fpc_dirinfo'#010+
#010+ #010,
'fpc_info: $(INFOTARGET)'#010+ 'fpc_info: $(INFOTARGET)'#010+
#010+ #010+
'[info_cfg]'#010+ '[info_cfg]'#010+
'fpc_infocfg:'#010+ 'fpc_infocfg:'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Con','figuration info =='#010+ ' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) FPC....... $(FPC)'#010+ ' @$(ECHO) FPC....... $(FPC)'#010+
' @$(ECHO) Version... $(FPC_VERSION)'#010+ ' @$(ECHO) Version... $(FPC_VERSION)'#010+
' @$(ECHO) CPU....... $(CPU_TARGET)'#010+ ' @$(ECHO) CPU....... $(CPU','_TARGET)'#010+
' @$(ECHO) Source.... $(OS_SOURCE)'#010+ ' @$(ECHO) Source.... $(OS_SOURCE)'#010+
' @$(ECHO) Target.... $(OS_TARGE','T)'#010+ ' @$(ECHO) Target.... $(OS_TARGET)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[info_dirs]'#010+ '[info_dirs]'#010+
@ -1339,31 +1344,31 @@ const fpcmakeini : array[0..121,1..240] of char=(
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+ ' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
'ifdef NEEDGCCLIB'#010+ 'ifdef NEEDGCCLIB',#010+
' @$(ECHO) GCC library is needed.'#010+ ' @$(ECHO) GCC library is needed.'#010+
'endif'#010+ 'endif'#010+
'ifdef NEEDOTHERLIB'#010+ 'ifdef NEEDOTHERLIB'#010+
' @$(ECHO) Other',' library is needed.'#010+ ' @$(ECHO) Other library is needed.'#010+
'endif'#010+ 'endif'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(EC','HO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'[info_tools]'#010+ '[info_tools]'#010+
'fpc_infotools:'#010+ 'fpc_infotools:'#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) Echo...... $(ECHO)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+
'ifdef PPDEP'#010+ 'ifdef PPD','EP'#010+
' @$(ECHO) PPDep..... $(PPDEP)'#010+ ' @$(ECHO) PPDep..... $(PPDEP)'#010+
'endif'#010+ 'endif'#010+
'ifdef PPUMOVE'#010+ 'ifdef PPUMOVE'#010+
' @$(ECHO) PPUMove... ','$(PPUMOVE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
'endif'#010+ 'endif'#010+
'ifdef PPUFILES'#010+ 'ifdef PPUFILES'#010+
' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+ ' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+
@ -1371,11 +1376,11 @@ const fpcmakeini : array[0..121,1..240] of char=(
'ifdef DATA2INC'#010+ 'ifdef DATA2INC'#010+
' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+ ' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+
'endif'#010+ 'endif'#010+
'ifdef SED'#010+ 'ifdef SED',#010+
' @$(ECHO) Sed....... $(SED)'#010+ ' @$(ECHO) Sed....... $(SED)'#010+
'endif'#010+ 'endif'#010+
'ifdef DATE'#010+ 'ifdef DATE'#010+
' @$(ECHO) Date...... $(DATE)',#010+ ' @$(ECHO) Date...... $(DATE)'#010+
'endif'#010+ 'endif'#010+
'ifdef DIFF'#010+ 'ifdef DIFF'#010+
' @$(ECHO) Diff...... $(DIFF)'#010+ ' @$(ECHO) Diff...... $(DIFF)'#010+
@ -1384,75 +1389,78 @@ const fpcmakeini : array[0..121,1..240] of char=(
' @$(ECHO) Cmp....... $(CMP)'#010+ ' @$(ECHO) Cmp....... $(CMP)'#010+
'endif'#010+ 'endif'#010+
'ifdef UPXPROG'#010+ 'ifdef UPXPROG'#010+
' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Upx..','..... $(UPXPROG)'#010+
'endif'#010+ 'endif'#010+
'ifdef ZIPPROG'#010+ 'ifdef ZIPPROG'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
'endif'#010+ 'endif'#010+
' ',' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[info_objects]'#010+ '[info_objects]'#010+
'fpc_infoobjects:'#010+ 'fpc_infoobjects:'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+ ' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+ ' @$(ECHO) LoaderObjects..... ','$(LOADEROBJECTS)'#010+
' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+ ' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+
' @$(ECHO) Exe','Objects........ $(EXEOBJECTS)'#010+ ' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+ ' @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+
' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+ ' @$(ECHO) ExtraCleanFiles... $(EXTRACLE','ANFILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+ ' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
' ',' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+ ' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[info_install]'#010+ '[info_install]'#010+
'fpc_infoinstall:'#010+ 'fpc_infoinstall:'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+ ' @$(ECHO) == Install in','fo =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
'ifdef DATE'#010+ 'ifdef DATE'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+
'endif',#010+ 'endif'#010+
'ifdef PACKAGEPREFIX'#010+ 'ifdef PACKAGEPREFIX'#010+
' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+ ' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+
'endif'#010+ 'endif'#010+
'ifdef PACKAGENAME'#010+ 'ifdef PACKAGENAME'#010+
' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+ ' @$(ECHO) PackageName.......... $(PACKAG','ENAME)'#010+
'endif'#010+ 'endif'#010+
' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+ ' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' ',' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+ ' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+
' @$(ECHO) BinInstallDir........ $(BININSTALLDIR)'#010+ ' @$(ECHO) BinInstallDir........ $(BININSTALLDIR)'#010+
' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+ ' @$(ECHO) LibInstallDir.......','. $(LIBINSTALLDIR)'#010+
' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+ ' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+
' @$(EC','HO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+ ' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
' @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)'#010+ ' @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)'#010+
' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+ ' @$(ECHO) DataInstallDir....... $(DATA','INSTALLDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+ ' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+
' ',' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[directorytargets]'#010+ '[directorytargets]'#010+
'#####################################################################'#010+ '#####################################################################',
#010+
'# Directories'#010+ '# Directories'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'[loc','almakefile]'#010+ '[localmakefile]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Local Makefile'#010+ '# Local Makefile'#010+
'#####################################################################'#010+ '###################################################','#################'+
'#'#010+
#010+ #010+
'ifneq ($(wildcard fpcmake.loc),)'#010+ 'ifneq ($(wildcard fpcmake.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+
#010+ #010+
#010+ #010+
'[end]'#010 '[end]'#010

31
utils/fpcmake.ini
View File

@ -1021,6 +1021,12 @@ fpc_debug:
.PHONY: fpc_smart fpc_shared .PHONY: fpc_smart fpc_shared
ifdef LIBVERSION
LIBFULLNAME=$(LIBNAME).$(LIBVERSION)
else
LIBFULLNAME=$(LIBNAME)
endif
# Default sharedlib units are all unit objects # Default sharedlib units are all unit objects
ifndef SHAREDLIBUNITOBJECTS ifndef SHAREDLIBUNITOBJECTS
SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS) SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
@ -1034,7 +1040,7 @@ ifdef inlinux
ifndef LIBNAME ifndef LIBNAME
@$(ECHO) "LIBNAME not set" @$(ECHO) "LIBNAME not set"
else else
$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME) $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBFULLNAME)
endif endif
else else
@$(ECHO) "Shared Libraries not supported" @$(ECHO) "Shared Libraries not supported"
@ -1054,14 +1060,7 @@ endif
ifdef INSTALLPPUFILES ifdef INSTALLPPUFILES
ifdef PPUFILES ifdef PPUFILES
ifdef inlinux
INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)) INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
ifdef LIBNAME
INSTALLPPULIBFILES=$(LIBNAME)
endif
else
INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
endif
else else
INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))) INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)))
endif endif
@ -1076,8 +1075,11 @@ ifdef INSTALLPPUFILES
ifneq ($(INSTALLPPULINKFILES),) ifneq ($(INSTALLPPULINKFILES),)
@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES)) @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
endif endif
ifneq ($(INSTALLPPULIBFILES),) ifneq ($(wildcard $(LIBFULLNAME)),)
@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES)) @$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
ifdef inlinux
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
endif
endif endif
endif endif
ifdef EXTRAINSTALLFILES ifdef EXTRAINSTALLFILES
@ -1100,9 +1102,12 @@ ifdef INSTALLPPUFILES
ifneq ($(INSTALLPPULINKFILES),) ifneq ($(INSTALLPPULINKFILES),)
$(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR) $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)
endif endif
ifneq ($(INSTALLPPULIBFILES),) ifneq ($(wildcard $(LIBFULLNAME)),)
$(MKDIR) $(LIBINSTALLDIR) $(MKDIR) $(LIBINSTALLDIR)
$(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR) $(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
ifdef inlinux
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
endif
endif endif
endif endif
ifdef EXTRAINSTALLFILES ifdef EXTRAINSTALLFILES
@ -1228,7 +1233,7 @@ ifdef EXTRACLEANFILES
-$(DEL) $(EXTRACLEANFILES) -$(DEL) $(EXTRACLEANFILES)
endif endif
ifdef LIBNAME ifdef LIBNAME
-$(DEL) $(LIBNAME) -$(DEL) $(LIBNAME) $(LIBFULLNAME)
endif endif
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)