mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-18 17:19:32 +02:00
* also include sec_units if only implicitunits are available
git-svn-id: trunk@9861 -
This commit is contained in:
peter
parent
011c8002b0
commit
337c3cba5d
@ -1568,13 +1568,13 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'.PHONY: fpc_units'#010+
|
||||
#010+
|
||||
'ifneq',' ($(TARGET_UNITS),)'#010+
|
||||
'ifneq',' ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+
|
||||
'override ALLTARGET+=fpc_units'#010+
|
||||
#010+
|
||||
'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
|
||||
'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
|
||||
'NITS))'#010+
|
||||
'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICI','TUNITPPUFILES)'#010+
|
||||
'override INSTALLPPUFILES+=$(','UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
||||
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
@ -1582,30 +1582,30 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
#010+
|
||||
'[exerules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Exes'#010+
|
||||
'###########','#########################################################'+
|
||||
'#################################################################','###'+
|
||||
'#'#010+
|
||||
'# Exes'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_exes'#010+
|
||||
#010+
|
||||
'# Programs are not needed for a cross installation'#010+
|
||||
'ifndef CROSSINSTALL'#010+
|
||||
'ifneq ($(TARGET_PROGRAMS),)'#010+
|
||||
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
||||
'ove','rride EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+
|
||||
'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
|
||||
') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+
|
||||
'PROGRAMS)))'#010+
|
||||
'override EXEFILES=$(addsuffix $(EXEEXT),','$(TARGET_PROGRAMS))'#010+
|
||||
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
|
||||
'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+
|
||||
'$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PR'+
|
||||
'OGRAMS)))'#010,
|
||||
#010+
|
||||
'override ALLTARGET+=fp','c_exes'#010+
|
||||
'override ALLTARGET+=fpc_exes'#010+
|
||||
'override INSTALLEXEFILES+=$(EXEFILES)'#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+
|
||||
'ov','erride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
@ -1615,9 +1615,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'[rstrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Resource strings'#010+
|
||||
'#######','#############################################################'+
|
||||
'#'#010+
|
||||
'# R','esource strings'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'ifdef TARGET_RSTS'#010+
|
||||
'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
|
||||
@ -1627,7 +1626,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
#010+
|
||||
'[examplerules]'#010+
|
||||
'##########################################','##########################'+
|
||||
'###################','#################################################'+
|
||||
'#'#010+
|
||||
'# Examples'#010+
|
||||
'#####################################################################'#010+
|
||||
@ -1636,26 +1635,26 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'ifneq ($(TARGET_EXAMPLES),)'#010+
|
||||
'HASEXAMPLES=1'#010+
|
||||
'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_E','XA'+
|
||||
'override EXAMPLESOURCEFILES:=$(wildcard $(a','ddsuffix .pp,$(TARGET_EXA'+
|
||||
'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+
|
||||
'_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
|
||||
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
|
||||
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_','EXAMPLES)) $(ad'+
|
||||
'override EXAMPLEOFILES:=$(adds','uffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
|
||||
'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
|
||||
'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+
|
||||
'GET_EXAMPLES)))'#010+
|
||||
#010+
|
||||
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
||||
'ifeq ($(OS_','TARGET),os2)'#010+
|
||||
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXA','MPLEOFILES)'#010+
|
||||
'ifeq ($(OS_TARGET),os2)'#010+
|
||||
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
||||
'endif'#010+
|
||||
'ifeq ($(OS_TARGET),emx)'#010+
|
||||
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+
|
||||
'ifneq ($(TARGET_EXAMPLEDIRS)',',)'#010+
|
||||
'HASEXAMPLES=1'#010+
|
||||
'endif'#010,
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
|
||||
'S))'#010+
|
||||
@ -1664,7 +1663,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'[compilerules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# General compile rules'#010+
|
||||
'######################################################','##############'+
|
||||
'###############################','#####################################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
|
||||
@ -1675,7 +1674,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'fpc_all: $(FPCMADE)'#010+
|
||||
#010+
|
||||
'fpc_smart:'#010+
|
||||
' $(MAKE) all LINKSMART=1 CREATESMAR','T=1'#010+
|
||||
' $(MAKE) all',' LINKSMART=1 CREATESMART=1'#010+
|
||||
#010+
|
||||
'fpc_debug:'#010+
|
||||
' $(MAKE) all DEBUG=1'#010+
|
||||
@ -1686,9 +1685,9 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'# General compile rules, available for both possible .pp and .pas exte'+
|
||||
'nsions'#010+
|
||||
#010+
|
||||
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+
|
||||
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .','dpr .pp .rc .res'#010+
|
||||
#010+
|
||||
'$(COM','PILER_UNITTARGETDIR):'#010+
|
||||
'$(COMPILER_UNITTARGETDIR):'#010+
|
||||
' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
|
||||
#010+
|
||||
'$(COMPILER_TARGETDIR):'#010+
|
||||
@ -1699,8 +1698,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'%$(PPUEXT): %.pas'#010+
|
||||
' $(COMPILER) $<'#010+
|
||||
' ',' $(EXECPPAS)'#010+
|
||||
' ',' $(COMPILER) $<'#010+
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'%$(EXEEXT): %.pp'#010+
|
||||
' $(COMPILER) $<'#010+
|
||||
@ -1714,8 +1713,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
' $(COMPILER) $<'#010+
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'%$(EXEEXT): %.dpr'#010+
|
||||
' $(COMPILE','R) $<'#010+
|
||||
'%$(EXEEXT): ','%.dpr'#010+
|
||||
' $(COMPILER) $<'#010+
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'%.res: %.rc'#010+
|
||||
@ -1723,16 +1722,15 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
|
||||
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %.lpr ','$(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_I','NCLUDEDIR)'#010+
|
||||
'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
||||
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
||||
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETD','IR)'#010+
|
||||
#010+
|
||||
'[sharedrules]'#010+
|
||||
'####','################################################################'+
|
||||
'#'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Library'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
@ -1740,8 +1738,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'override INSTALLTARGET+=fpc_shared_install'#010+
|
||||
#010+
|
||||
'ifndef SHARED_LIBVERSION'#010+
|
||||
'SHAR','ED_LIBVERSION=$(FPC_VERSION)'#010+
|
||||
'ifndef',' SHARED_LIBVERSION'#010+
|
||||
'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'ifndef SHARED_LIBNAME'#010+
|
||||
@ -1753,7 +1751,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'N)$(SHAREDLIBEXT)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Default sharedlib units ','are all unit objects'#010+
|
||||
'# D','efault sharedlib units are all unit objects'#010+
|
||||
'ifndef SHARED_LIBUNITS'#010+
|
||||
'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
|
||||
'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
|
||||
@ -1761,23 +1759,23 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_shared:'#010+
|
||||
'ifdef HASSHAREDLIB'#010+
|
||||
' $(MAKE) all C','REATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
|
||||
'ifdef HASSHAREDLI','B'#010+
|
||||
' $(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+
|
||||
'endif'#010+
|
||||
'else'#010+
|
||||
' @$(ECHO) Shared Libraries not suppor','ted'#010+
|
||||
' @$(ECHO) Shar','ed Libraries not supported'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'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) $(INST'+
|
||||
'ALL_SHAREDDIR)'#010+
|
||||
'endi','f'#010+
|
||||
' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(','IN'+
|
||||
'STALL_SHAREDDIR)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
@ -1786,7 +1784,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'# Install rules'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinst','all'#010+
|
||||
'.PHONY: fpc_install fpc_source','install fpc_exampleinstall'#010+
|
||||
#010+
|
||||
'ifdef INSTALL_UNITS'#010+
|
||||
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
||||
@ -1795,18 +1793,18 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'ifdef INSTALL_BUILDUNIT'#010+
|
||||
'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
|
||||
'(INSTALLPPUFILES))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010,
|
||||
#010+
|
||||
'ifdef INSTALLPPUFILES'#010,
|
||||
'ifdef INSTALLPPUFILES'#010+
|
||||
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
||||
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
|
||||
',$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT)'+
|
||||
',$(STATICLIBEXT),$(INSTALLPPUF','ILES)))'#010+
|
||||
',$(STAT','ICLIBEXT),$(INSTALLPPUFILES)))'#010+
|
||||
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
|
||||
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
|
||||
'$(INSTALLPPUFILES)))'#010+
|
||||
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
||||
'EFIX),$(notdir $(INSTALLPPULINKFILES)))',')'#010+
|
||||
'EFIX),$(notdir $','(INSTALLPPULINKFILES))))'#010+
|
||||
'endif'#010+
|
||||
'# Implicitly install Package.fpc'#010+
|
||||
'override INSTALL_CREATEPACKAGEFPC=1'#010+
|
||||
@ -1815,18 +1813,18 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'ifdef INSTALLEXEFILES'#010+
|
||||
'ifneq ($(TARGETDIRPREFIX),)'#010+
|
||||
'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
|
||||
'STALLEXEFILES)))'#010+
|
||||
'STALLEXEFILES',')))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_in','stall: all $(INSTALLTARGET)'#010+
|
||||
'fpc_install: all $(INSTALLTARGET)'#010+
|
||||
'ifdef INSTALLEXEFILES'#010+
|
||||
' $(MKDIR) $(INSTALL_BINDIR)'#010+
|
||||
'# Compress the exes if upx is defined'#010+
|
||||
'ifdef UPXPROG'#010+
|
||||
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
||||
'endif'#010+
|
||||
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)',#010+
|
||||
' $(INSTALLEXE) $(INSTALLEXEF','ILES) $(INSTALL_BINDIR)'#010+
|
||||
'endif'#010+
|
||||
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
|
||||
'ifdef FPCMAKE'#010+
|
||||
@ -1834,8 +1832,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'c,'#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+
|
||||
'ifneq ($(wildcar','d Makefile.fpc),)'#010+
|
||||
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
|
||||
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
||||
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
||||
'endif'#010+
|
||||
@ -1843,14 +1841,14 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'ifdef INSTALLPPUFILES'#010+
|
||||
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
||||
' $(INS','TALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#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+
|
||||
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
||||
' $(INSTALL) $(LIB_','FULLNAME) $(INSTALL_LIBDIR)'#010+
|
||||
' ',' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
||||
'ifdef inUnix'#010+
|
||||
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
||||
'endif'#010+
|
||||
@ -1858,16 +1856,16 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
'ifdef INSTALL_FILES'#010+
|
||||
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
||||
' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
|
||||
' $(INSTALL) $(INSTALL_FILES) $(INS','TALL_DATADIR)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fp','c_sourceinstall: distclean'#010+
|
||||
'fpc_sourceinstall: distclean'#010+
|
||||
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
|
||||
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
|
||||
#010+
|
||||
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
||||
'ifdef HASEXAMPLES'#010+
|
||||
' $(MKDIR) $(INSTALL_EXAMPLEDI','R)'#010+
|
||||
' $(MKD','IR) $(INSTALL_EXAMPLEDIR)'#010+
|
||||
'endif'#010+
|
||||
'ifdef EXAMPLESOURCEFILES'#010+
|
||||
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
|
||||
@ -1877,9 +1875,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'AMPLEDIR)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'[distinstallrules]'#010+
|
||||
'#########','###########################################################'+
|
||||
'#'#010+
|
||||
'[dist','installrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Dist Install'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
@ -1888,15 +1885,14 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'fpc_distinstall: install exampleinstall'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[zipinstallrules]'#010+
|
||||
'########','############################################################'+
|
||||
'#'#010+
|
||||
'[zi','pinstallrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Zip'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
|
||||
#010+
|
||||
'# Temporary path to pack a file, c','an only use a single deep'#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+
|
||||
@ -1906,8 +1902,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Maybe create default zipname from packagename'#010+
|
||||
'i','fndef ZIPNAME'#010+
|
||||
'# Maybe create default zip','name from packagename'#010+
|
||||
'ifndef ZIPNAME'#010+
|
||||
'ifdef DIST_ZIPNAME'#010+
|
||||
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
||||
'else'#010+
|
||||
@ -1920,9 +1916,9 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# ZipTarget'#010+
|
||||
'ifndef ZIPTARGET'#010+
|
||||
'ifndef ZIPTARGET',#010+
|
||||
'ifdef DIST_ZIPTARGET'#010+
|
||||
'Z','IPTARGET=DIST_ZIPTARGET'#010+
|
||||
'ZIPTARGET=DIST_ZIPTARGET'#010+
|
||||
'else'#010+
|
||||
'ZIPTARGET=install'#010+
|
||||
'endif'#010+
|
||||
@ -1938,9 +1934,9 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'# Use a wrapper script by default for Os/2'#010+
|
||||
'ifndef inUnix'#010+
|
||||
'USEZIPWRAPPER=1'#010+
|
||||
'endif'#010+
|
||||
'en','dif'#010+
|
||||
#010+
|
||||
'# We need to be ab','le 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+
|
||||
@ -1949,35 +1945,35 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'ZIPPATHSEP=/'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Create commands to create the zip/tar file'#010+
|
||||
'ZI','PCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
|
||||
'# Create commands to cre','ate 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+
|
||||
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
||||
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTF','ILE) *'#010+
|
||||
'else'#010+
|
||||
'ZIPDESTFILE',':=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
|
||||
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
|
||||
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
||||
'TFILE) *'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_zipinstall:'#010+
|
||||
' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
||||
' $(MKDIR) $(DIST_DEST','DIR)'#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))" > $(ZIPWRAPPE'+
|
||||
'R)'#010+
|
||||
' $(ECHOREDIR) -e "$(subs','t \,\\,$(ZIPCMD_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) >> $(ZIPWRAPPER)'#010+
|
||||
'endif'#010+
|
||||
'ifdef inUnix'#010+
|
||||
' /bin/sh $(ZIPWRAPPER)'#010+
|
||||
@ -1990,7 +1986,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
' $(DEL) $(ZIPWRAPPER)'#010+
|
||||
'else'#010+
|
||||
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPC','MD_CDBASE)'#010+
|
||||
' $(ZIPCMD_CDPACK) ;',' $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
||||
'endif'#010+
|
||||
' $(DELTREE) $(PACKDIR)'#010+
|
||||
#010+
|
||||
@ -2000,7 +1996,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'fpc_zipexampleinstall:'#010+
|
||||
'ifdef HASEXAMPLES'#010+
|
||||
' $(MAKE) fpc_zipinstall ZIPTARGET=exa','mpleinstall ZIPSUFFIX=$('+
|
||||
' $(MAKE) fpc_z','ipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+
|
||||
'ZIPEXAMPLESUFFIX)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
@ -2010,9 +2006,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'[cleanrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Clean rules'#010+
|
||||
'###################','#################################################'+
|
||||
'#'#010+
|
||||
'# Clean ru','les'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
||||
#010+
|
||||
@ -2022,20 +2017,20 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
#010+
|
||||
'ifdef CLEAN_UNITS'#010+
|
||||
'override CLEANPPUFILES+=$(add','suffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
||||
'overri','de CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'ifdef CLEANPPUFILES'#010+
|
||||
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
||||
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
|
||||
'LEANPPUFILES))) $(addprefix $(IMPORTLIBP','REFIX),$(subst $(PPUEXT),$(S'+
|
||||
'LEANPPUFILES))) $','(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
|
||||
'TATICLIBEXT),$(CLEANPPUFILES)))'#010+
|
||||
'ifdef DEBUGSYMEXT'#010+
|
||||
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
|
||||
'UFILES))'#010+
|
||||
'endif'#010+
|
||||
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
||||
'ILES))'#010,
|
||||
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPRE','FIX),$(CLEANPP'+
|
||||
'UFILES))'#010+
|
||||
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
||||
'IX),$(CLEANPPULINKFILES)))'#010+
|
||||
'endif'#010+
|
||||
@ -2045,7 +2040,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
' -$(DEL) $(CLEANEXEFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifdef CLEANPPUFILES'#010+
|
||||
' -$(DEL) $(CLEANPPUFILES',')'#010+
|
||||
' ','-$(DEL) $(CLEANPPUFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
||||
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
||||
@ -2054,17 +2049,17 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
||||
'endif'#010+
|
||||
'ifdef CLEAN_FILES'#010+
|
||||
' -$(DEL) $(CLEAN_FILES)'#010+
|
||||
' -$(DEL) $(CLEAN','_FILES)'#010+
|
||||
'endif'#010+
|
||||
'ifdef LIB','_NAME'#010+
|
||||
'ifdef LIB_NAME'#010+
|
||||
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
||||
'endif'#010+
|
||||
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
|
||||
'PCEXTFILE) $(REDIRFILE)'#010+
|
||||
' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
|
||||
#010+
|
||||
'fpc_cleanall: $(CLEANTARGET)'#010+
|
||||
'ifdef CLEANEXEF','ILES'#010+
|
||||
'fpc_cleanall: $(CLEAN','TARGET)'#010+
|
||||
'ifdef CLEANEXEFILES'#010+
|
||||
' -$(DEL) $(CLEANEXEFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifdef COMPILER_UNITTARGETDIR'#010+
|
||||
@ -2074,16 +2069,15 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
||||
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifdef CLEANRSTFILES'#010+
|
||||
' -$(DEL)',' $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
|
||||
#010+
|
||||
'ifdef CLEANR','STFILES'#010+
|
||||
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
' -$(DELTREE) units'#010+
|
||||
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
||||
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
||||
'ifneq ($(PPUEXT),.ppu)'#010+
|
||||
' -$(DEL) *.o *.','ppu *.a'#010+
|
||||
'ifneq ($(PPUEXT),.ppu)',#010+
|
||||
' -$(DEL) *.o *.ppu *.a'#010+
|
||||
'endif'#010+
|
||||
' -$(DELTREE) *$(SMARTEXT)'#010+
|
||||
' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
|
||||
@ -2091,8 +2085,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
' -$(DEL) *_ppas$(BATCHEXT)'#010+
|
||||
'ifdef AOUTEXT'#010+
|
||||
' -$(DEL) *$(AOUTEXT)'#010+
|
||||
'endif'#010+
|
||||
'ifdef DEBUGSYMEXT'#010,
|
||||
'e','ndif'#010+
|
||||
'ifdef DEBUGSYMEXT'#010+
|
||||
' -$(DEL) *$(DEBUGSYMEXT)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
@ -2102,8 +2096,9 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'[baseinforules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Base info rules'#010+
|
||||
'#####################################################################'#010+
|
||||
#010,
|
||||
'################################################','####################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_baseinfo'#010+
|
||||
#010+
|
||||
'override INFORULES+=fpc_baseinfo'#010+
|
||||
@ -2112,95 +2107,96 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Package info =='#010+
|
||||
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
||||
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
||||
' @','$(ECHO)'#010+
|
||||
' @$(ECHO) Package Version.. $(PAC','KAGE_VERSION)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Configuration info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) FPC.......... $(FPC)'#010+
|
||||
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
||||
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
||||
' @$(ECHO) Target CPU... $(CPU_TA','RGET)'#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) Full Target.. $(FULL_TARGET)'#010+
|
||||
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
|
||||
' ',' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
|
||||
' @$(ECHO) SourceSuf','fix. $(SOURCESUFFIX)'#010+
|
||||
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Directory info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
||||
' ',' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
||||
' @$(ECHO) Basedir.','........ $(BASEDIR)'#010+
|
||||
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
||||
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
|
||||
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
||||
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) GCC library.....',' $(GCCLIBDIR)'#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) Ar........ $(AR)'#010+
|
||||
' ',' @$(ECHO) Rc........ $(RC)'#010+
|
||||
' @$(ECH','O) 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) Echo...... $(E','CHO)'#010+
|
||||
' @','$(ECHO) Echo...... $(ECHO)'#010+
|
||||
' @$(ECHO) Shell..... $(SHELL)'#010+
|
||||
' @$(ECHO) Date...... $(DATE)'#010+
|
||||
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
||||
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
||||
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
||||
' @$(ECHO) Zip....... $(ZIPPROG)'#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_IMPL','ICITUNITS)'#010+
|
||||
' @$(ECHO) Target Implic','it 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_EXA','MPLEDIRS)'#010+
|
||||
' @$(ECHO) Target Examp','leDirs.... $(TARGET_EXAMPLEDIRS)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
||||
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
|
||||
' @$(ECHO) Install Files.','...... $(INSTALL_FILES)'#010+
|
||||
' @','$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Install info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
||||
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
|
||||
' @$(ECHO) ZipPrefix............ $(Z','IPPREFIX)'#010+
|
||||
' @$(ECHO) Zi','pPrefix............ $(ZIPPREFIX)'#010+
|
||||
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
|
||||
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
||||
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
|
||||
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
||||
' ',' @$(ECHO)'#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 library dir.. $(INSTALL_LIBDIR)'#010+
|
||||
' @$(ECHO) Install units dir.... $(INSTALL_','UNITDIR)'#010+
|
||||
' @$(ECHO) Install u','nits 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 data dir..... $(INSTALL_','DATADIR)'#010+
|
||||
' @$(ECHO) Install d','ata dir..... $(INSTALL_DATADIR)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
||||
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
#010+
|
||||
'[inforules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# ','Info rules'#010+
|
||||
'#################################################','###################'+
|
||||
'#'#010+
|
||||
'# Info rules'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_info'#010+
|
||||
@ -2209,36 +2205,35 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'[makefilerules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Rebuild Makefile'#010+
|
||||
'###########','#########################################################'+
|
||||
'#'#010+
|
||||
'# Rebui','ld Makefile'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
|
||||
' \'#010+
|
||||
' fpc_makefile_dirs'#010+
|
||||
#010+
|
||||
'fpc_makefile:'#010+
|
||||
' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
|
||||
' $(FPCMAKE) -w -T$(OS_TARGET) Makefi','le.fpc'#010+
|
||||
#010+
|
||||
'fpc_makefile_su','b1:'#010+
|
||||
'fpc_makefile_sub1:'#010+
|
||||
'ifdef TARGET_DIRS'#010+
|
||||
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
|
||||
'T_DIRS))'#010+
|
||||
'endif'#010+
|
||||
'ifdef TARGET_EXAMPLEDIRS'#010+
|
||||
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
|
||||
'T_EXAMPLEDIRS))'#010+
|
||||
'T_EXAMPLEDIRS))',#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_makefile_su','b2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+
|
||||
'T_EXAMPLEDIRS))'#010+
|
||||
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
|
||||
'EXAMPLEDIRS))'#010+
|
||||
#010+
|
||||
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
|
||||
#010+
|
||||
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
|
||||
#010+
|
||||
'[localmakefile]'#010+
|
||||
'###################################################','#################'+
|
||||
'############################','########################################'+
|
||||
'#'#010+
|
||||
'# Local Makefile'#010+
|
||||
'#####################################################################'#010+
|
||||
@ -2249,7 +2244,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
#010+
|
||||
'[userrules]'#010+
|
||||
'############################################################','########'+
|
||||
'#####################################','###############################'+
|
||||
'#'#010+
|
||||
'# Users rules'#010+
|
||||
'#####################################################################'#010+
|
||||
@ -2257,7 +2252,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'[lclrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# LCL Rules'#010+
|
||||
'####################################################','################'+
|
||||
'#############################','#######################################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'# LCL Platform'#010+
|
||||
@ -2270,9 +2265,9 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'endif'#010+
|
||||
'export LCL_PLATFORM'#010+
|
||||
#010+
|
||||
'# Check if the specified LCLDIR is correct'#010+
|
||||
'# Check if the specified LCLDIR is correc','t'#010+
|
||||
'ifdef LCLDIR'#010+
|
||||
'override',' LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
|
||||
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
|
||||
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
||||
'override LCLDIR=wrong'#010+
|
||||
'endif'#010+
|
||||
@ -2282,7 +2277,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'# Check if the default LCLDIR is correct'#010+
|
||||
'ifdef DEFAULT_LCLDIR'#010+
|
||||
'override LCLDIR:=$(subst \,/,$(D','EFAULT_LCLDIR))'#010+
|
||||
'override ','LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
||||
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
||||
'override LCLDIR=wrong'#010+
|
||||
'endif'#010+
|
||||
@ -2290,8 +2285,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'# Check for development version'#010+
|
||||
'ifeq ($(LCLDIR),wrong)'#010+
|
||||
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
||||
' $(addsuffix',' /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
||||
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword',' $(wildca'+
|
||||
'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
||||
'ifeq ($(LCLDIR),)'#010+
|
||||
'override LCLDIR=wrong'#010+
|
||||
'endif'#010+
|
||||
@ -2299,8 +2294,8 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
#010+
|
||||
'# Check 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+
|
||||
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword',' $(wildca'+
|
||||
'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
|
||||
'ifeq ($(LCLDIR),)'#010+
|
||||
'override LCLDIR=wrong'#010+
|
||||
'endif'#010+
|
||||
@ -2309,17 +2304,16 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'# Generate dirs'#010+
|
||||
'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
|
||||
'IR)/units)'#010+
|
||||
'override LCLCOMPONENTDIR:=$(wildca','rd $(LCLDIR)/.. $(LCLDIR)/../compo'+
|
||||
'override LC','LCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+
|
||||
'nents $(LCLDIR)/components)'#010+
|
||||
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
|
||||
#010+
|
||||
'# Add LCL dirs to paths'#010+
|
||||
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
|
||||
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
|
||||
'override COMPILER_UNITDIR+=$(LCLUNITDIR)',#010+
|
||||
#010+
|
||||
'[lclinforules]'#010+
|
||||
'######','##############################################################'+
|
||||
'#'#010+
|
||||
'#####################################################################'#010+
|
||||
'# LCL Info rules'#010+
|
||||
'#####################################################################'#010+
|
||||
'override INFORULES+=lclinfo'#010+
|
||||
@ -2327,11 +2321,11 @@ const fpcmakeini : array[0..215,1..240] of char=(
|
||||
'.PHONY: lclinfo'#010+
|
||||
#010+
|
||||
'lclinfo:'#010+
|
||||
' @$(ECHO) == LCL info =='#010+
|
||||
' ',' @$(ECHO)'#010+
|
||||
' @$(','ECHO) == LCL info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
|
||||
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
|
||||
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
|
||||
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
|
||||
' ',' @$(ECHO)'#010
|
||||
' @$(ECHO) LCL Component dir.... $','(LCLCOMPONENTDIR)'#010+
|
||||
' @$(ECHO)'#010
|
||||
);
|
||||
|
||||
@ -1522,7 +1522,7 @@ endif
|
||||
|
||||
.PHONY: fpc_units
|
||||
|
||||
ifneq ($(TARGET_UNITS),)
|
||||
ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
|
||||
override ALLTARGET+=fpc_units
|
||||
|
||||
override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
|
||||
|
||||
@ -644,7 +644,7 @@ implementation
|
||||
|
||||
{ Remove unused sections for targets }
|
||||
SkippedSecs:=0;
|
||||
if (not FInput.HasTargetVariable('target_units')) then
|
||||
if (not FInput.HasTargetVariable('target_units')) and (not FInput.HasTargetVariable('target_implicitunits')) then
|
||||
begin
|
||||
inc(SkippedSecs);
|
||||
FHasSection[sec_units]:=false;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user