paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 11:06:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Reverted r17969, now fpmake distclean is implemented

Browse Source 
git-svn-id: trunk@17986 -
This commit is contained in:
joost 2011-07-13 20:25:02 +00:00
parent 25a9052ced
commit 08ee418513
7 changed files with 87 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fastcgi/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/07/10] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -284,7 +284,6 @@ export FPCFPMAKE
export FPMAKE_SKIP_CONFIG export FPMAKE_SKIP_CONFIG
endif endif
else else
FPMAKE_SKIP_CONFIG=-n
FPCFPMAKE=$(FPC) FPCFPMAKE=$(FPC)
endif endif
endif endif
@ -2022,7 +2021,7 @@ ifdef HASEXAMPLES
endif endif
fpc_zipdistinstall: fpc_zipdistinstall:
$(MAKE) fpc_zipinstall ZIPTARGET=distinstall $(MAKE) fpc_zipinstall ZIPTARGET=distinstall
.PHONY: fpc_clean fpc_cleanall fpc_distclean fpc_fpmakeclean .PHONY: fpc_clean fpc_cleanall fpc_distclean
ifdef EXEFILES ifdef EXEFILES
override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
endif endif
@ -2094,7 +2093,6 @@ ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT) -$(DEL) *$(DEBUGSYMEXT)
endif endif
fpc_distclean: cleanall fpc_distclean: cleanall
fpc_fpmakeclean: cleanall
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
fpc_baseinfo: fpc_baseinfo:
@ -2239,5 +2237,4 @@ else
endif endif
distinstall: install distinstall: install
distclean: clean distclean: clean
fpmakeclean: clean
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)

3
packages/fastcgi/Makefile.fpc
View File

@ -1,5 +1,5 @@
# #
# Makefile.fpc for running fpmake # Makefile.fpc for FastCGI
# #
[package] [package]
@ -55,5 +55,4 @@ endif
# none. # none.
distinstall: install distinstall: install
distclean: clean distclean: clean
fpmakeclean: clean
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)

7
packages/fcl-web/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/07/10] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -284,7 +284,6 @@ export FPCFPMAKE
export FPMAKE_SKIP_CONFIG export FPMAKE_SKIP_CONFIG
endif endif
else else
FPMAKE_SKIP_CONFIG=-n
FPCFPMAKE=$(FPC) FPCFPMAKE=$(FPC)
endif endif
endif endif
@ -2022,7 +2021,7 @@ ifdef HASEXAMPLES
endif endif
fpc_zipdistinstall: fpc_zipdistinstall:
$(MAKE) fpc_zipinstall ZIPTARGET=distinstall $(MAKE) fpc_zipinstall ZIPTARGET=distinstall
.PHONY: fpc_clean fpc_cleanall fpc_distclean fpc_fpmakeclean .PHONY: fpc_clean fpc_cleanall fpc_distclean
ifdef EXEFILES ifdef EXEFILES
override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
endif endif
@ -2094,7 +2093,6 @@ ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT) -$(DEL) *$(DEBUGSYMEXT)
endif endif
fpc_distclean: cleanall fpc_distclean: cleanall
fpc_fpmakeclean: cleanall
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
fpc_baseinfo: fpc_baseinfo:
@ -2239,5 +2237,4 @@ else
endif endif
distinstall: install distinstall: install
distclean: clean distclean: clean
fpmakeclean: clean
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)

3
packages/fcl-web/Makefile.fpc
View File

@ -1,5 +1,5 @@
# #
# Makefile.fpc for running fpmake # Makefile.fpc for TDataSet for FCL
# #
[package] [package]
@ -55,5 +55,4 @@ endif
# none. # none.
distinstall: install distinstall: install
distclean: clean distclean: clean
fpmakeclean: clean
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)

159
utils/fpcm/fpcmake.inc
View File

@ -2129,7 +2129,7 @@ const fpcmakeini : array[0..226,1..240] of char=(
'# Clean rules'#010+ '# Clean rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_clean fpc_cleanall f','pc_distclean fpc_fpmakeclean'#010+ '.PHONY: fpc_clean fpc_cleanall f','pc_distclean'#010+
#010+ #010+
'ifdef EXEFILES'#010+ 'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
@ -2138,23 +2138,23 @@ const fpcmakeini : array[0..226,1..240] of char=(
#010+ #010+
'ifdef CLEAN_PROGRAMS'#010+ 'ifdef CLEAN_PROGRAMS'#010+
'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
'XEEXT), $(CLEAN_PROGRAMS',')))'#010+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef CLEAN_UNITS'#010+ 'ifdef',' CLEAN_UNITS'#010+
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$','(STATICLIBEXT),$'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$','('+
'(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(ST'+
'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'ATICLIBEXT),$(CLEANPPUFILES)))'#010+
'ifdef DEBUGSYMEXT'#010+ 'ifdef DEBUGSYMEXT'#010+
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
'UFILES))'#010+ 'UFILES))'#010+
'endif'#010+ 'endif'#010+
'override CLEANPPUFI','LES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+ 'override CLEANPPUFILES:=$(addprefix',' $(UNITTARGETDIRPREFIX),$(CLEANPP'+
'UFILES))'#010+ 'UFILES))'#010+
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
'IX),$(CLEANPPULINKFILES)))'#010+ 'IX),$(CLEANPPULINKFILES)))'#010+
@ -2162,9 +2162,9 @@ const fpcmakeini : array[0..226,1..240] of char=(
#010+ #010+
'fpc_clean: $(CLEANTARGET)'#010+ 'fpc_clean: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)',#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLE','ANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+
@ -2173,17 +2173,17 @@ const fpcmakeini : array[0..226,1..240] of char=(
'ifdef CLEANRSTFILES'#010+ 'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+ 'endif'#010+
'ifdef ','CLEAN_FILES'#010+ 'ifdef CLEAN_FILES'#010+
' -$(DEL) $(CLEAN_FILES)'#010+ ' ',' -$(DEL) $(CLEAN_FILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef LIB_NAME'#010+ 'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
'endif'#010+ 'endif'#010+
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
'PCEXTFILE) $(REDIRFILE)'#010+ 'PCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *$(ASMEXT) *_ppa','s$(BATCHEXT)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
#010+ #010+
'fpc_cleanall: $(CLEANTARGET)'#010+ 'fp','c_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+ 'endif'#010+
@ -2192,7 +2192,7 @@ const fpcmakeini : array[0..226,1..240] of char=(
' -$(DEL) $(CLEANPPUFILES)'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CL','EANPPULINKFILES)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)',#010+
'endif'#010+ 'endif'#010+
'ifdef CLEANRSTFILES'#010+ 'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
@ -2202,15 +2202,15 @@ const fpcmakeini : array[0..226,1..240] of char=(
' -$(DEL) $(CLEAN_FILES)'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+
'endif'#010+ 'endif'#010+
' -$(DELTREE) units'#010+ ' -$(DELTREE) units'#010+
' -$(DEL) *$(OEXT) *$(PPUEXT)',' *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(A','SMEXT) *$(STATICL'+
'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+ ' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+ 'endif'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+
' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
'CEXTFILE) ','$(REDIRFILE)'#010+ 'CEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *_ppas$(BATCHEXT)'#010+ ' ',' -$(DEL) *_ppas$(BATCHEXT)'#010+
'ifdef AOUTEXT'#010+ 'ifdef AOUTEXT'#010+
' -$(DEL) *$(AOUTEXT)'#010+ ' -$(DEL) *$(AOUTEXT)'#010+
'endif'#010+ 'endif'#010+
@ -2220,11 +2220,9 @@ const fpcmakeini : array[0..226,1..240] of char=(
#010+ #010+
'fpc_distclean: cleanall'#010+ 'fpc_distclean: cleanall'#010+
#010+ #010+
'fpc_fpmakeclean: cleanall'#010+
#010+
#010+ #010+
'[baseinforules]'#010+ '[baseinforules]'#010+
'###################','#################################################'+ '##############################################################','######'+
'#'#010+ '#'#010+
'# Base info rules'#010+ '# Base info rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -2235,113 +2233,111 @@ const fpcmakeini : array[0..226,1..240] of char=(
#010+ #010+
'fpc_baseinfo:'#010+ 'fpc_baseinfo:'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(EC','HO) == Package info =='#010+ ' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) P','ackage Name..... $(PACKAGE_NAME)'#010+
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) FPC.......... ','$(FPC)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) FPC Version.. $(FP','C_VERSION)'#010+
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
' ',' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010,
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+
' @','$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+ ' @$(ECHO) == Directory info',' =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(EC','HO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' ',' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHE','RLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+ ' @$(ECHO) ',' == Tools info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) As........ $(AS)'#010+
' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+
' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+
' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' ',' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @','$(ECHO) Cp........ $(CPPROG)'#010+
' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+
' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+
' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+
' @$(E','CHO) Date...... $(DATE)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) ','FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+ ' @$(ECHO) == Object info =='#010+
' ',' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Loa','ders........ $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+
' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
' @$(ECHO) Target Programs....... $(T','ARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Di','rs........... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Clean Unit','s......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO) ',' Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECH','O) == Install info =='#010+ ' @$(ECHO) == Install info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' ',' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIP','CROSSPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) ZipSuffix...','......... $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Install base dir..... ','$(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Instal','l binary dir... $(INSTALL_BINDIR)'#010+
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INST','ALL_SOURCEDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install do','c dir...... $(INSTALL_DOCDIR)'#010+
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Dist destin','ation dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)',' Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[inforules]'#010+ '[inforules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Info rules'#010+ '# Info rules'#010+
'############################################','########################'+ '#####################################################################'#010+
'#'#010+
#010+ #010+
'.PHONY: fpc_info'#010+ '.PHONY: fpc_info',#010+
#010+ #010+
'fpc_info: $(INFORULES)'#010+ 'fpc_info: $(INFORULES)'#010+
#010+ #010+
'[makefilerules]'#010+ '[makefilerules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Rebuild Makefile'#010+ '# Rebuild Makefile'#010+
'##################################################################','##'+ '#####################################################################'#010+
'#'#010+
#010+ #010+
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ '.PHONY: fpc_makefile fpc_makefiles fpc','_makefile_sub1 fpc_makefile_su'+
' \'#010+ 'b2 \'#010+
' fpc_makefile_dirs'#010+ ' fpc_makefile_dirs'#010+
#010+ #010+
'fpc_makefile:'#010+ 'fpc_makefile:'#010+
@ -2349,25 +2345,25 @@ const fpcmakeini : array[0..226,1..240] of char=(
#010+ #010+
'fpc_makefile_sub1:'#010+ 'fpc_makefile_sub1:'#010+
'ifdef TARGET_DIRS'#010+ 'ifdef TARGET_DIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARG','ET) $(addsuffix /Makefile.fpc,$(TAR'+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
'GET_DIRS))'#010+ 'T_DIRS','))'#010+
'endif'#010+ 'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
'T_EXAMPLEDIRS))'#010+ 'T_EXAMPLEDIRS))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_', 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
'EXAMPLEDIRS))'#010+ 'EXAMPLEDIRS))'#010+
#010+ #010+
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ 'fpc_makefile_dirs: fpc_makef','ile_sub1 fpc_makefile_sub2'#010+
#010+ #010+
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+ #010+
'[localmakefile]'#010+ '[localmakefile]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Local Makefile'#010+ '# Local Makefile'#010+
'###################','#################################################'+ '##############################################################','######'+
'#'#010+ '#'#010+
#010+ #010+
'ifneq ($(wildcard fpcmake.loc),)'#010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+
@ -2378,17 +2374,16 @@ const fpcmakeini : array[0..226,1..240] of char=(
'[userrules]'#010+ '[userrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Users rules'#010+ '# Users rules'#010+
'###############################','#####################################'+ '#####################################################################'#010+
'#'#010+
#010+ #010+
'[lclrules]'#010+ '[lc','lrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# LCL Rules'#010+ '# LCL Rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'# LCL Platform'#010+ '# LCL Platform'#010+
'ifndef LCL_PLATFORM'#010+ 'ifndef LCL_PLATFORM'#010+
'i','fneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ 'ifneq ($(findstring $(OS_TARGET),win32 win64','),)'#010+
'LCL_PLATFORM=win32'#010+ 'LCL_PLATFORM=win32'#010+
'else'#010+ 'else'#010+
'LCL_PLATFORM=gtk'#010+ 'LCL_PLATFORM=gtk'#010+
@ -2399,8 +2394,8 @@ const fpcmakeini : array[0..226,1..240] of char=(
'# Check if the specified LCLDIR is correct'#010+ '# Check if the specified LCLDIR is correct'#010+
'ifdef LCLDIR'#010+ 'ifdef LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
'ifeq ($(wildcard $(LCLD','IR)/units/$(LCL_PLATFORM)),)'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+ 'override LCLDI','R=wrong'#010+
'endif'#010+ 'endif'#010+
'else'#010+ 'else'#010+
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
@ -2409,45 +2404,45 @@ const fpcmakeini : array[0..226,1..240] of char=(
'# Check if the default LCLDIR is correct'#010+ '# Check if the default LCLDIR is correct'#010+
'ifdef DEFAULT_LCLDIR'#010+ 'ifdef DEFAULT_LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_','PLATFORM)),)'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'en','dif'#010+
#010+ #010+
'# Check for development version'#010+ '# Check for development version'#010+
'ifeq ($(LCLDIR),wrong)'#010+ 'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'i','feq ($(LCLDIR),)'#010+ 'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
'endif'#010+ 'endi','f'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Check for release version'#010+ '# Check for release version'#010+
'ifeq ($(LCLDIR),wrong)'#010+ 'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))',#010+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+ 'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
'endif'#010+ 'en','dif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Generate dirs'#010+ '# Generate dirs'#010+
'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
'IR)/units)'#010+ 'IR)/units)'#010+
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
'nts $(LCLDIR)/compo','nents)'#010+ 'nts $(LCLDIR)/components)'#010+
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONEN','TDIR'#010+
#010+ #010+
'# Add LCL dirs to paths'#010+ '# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
#010+ #010+
'[lclinforules]'#010+ '[lclinforules]'#010+
'#############################################################','#######'+
'#'#010+
'# LCL Info rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# LCL Info rules'#010+
'#################','###################################################'+
'#'#010+
'override INFORULES+=lclinfo'#010+ 'override INFORULES+=lclinfo'#010+
#010+ #010+
'.PHONY: lclinfo'#010+ '.PHONY: lclinfo'#010+
@ -2455,8 +2450,8 @@ const fpcmakeini : array[0..226,1..240] of char=(
'lclinfo:'#010+ 'lclinfo:'#010+
' @$(ECHO) == LCL info =='#010+ ' @$(ECHO) == LCL info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Platform.............',' $(LCL_PLATFORM)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ ' @$(ECHO) LCLDIR..','............. $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
' @$(ECHO)'#010 ' @$(ECHO)'#010

4
utils/fpcm/fpcmake.ini
View File

@ -2036,7 +2036,7 @@ fpc_zipdistinstall:
# Clean rules # Clean rules
##################################################################### #####################################################################
.PHONY: fpc_clean fpc_cleanall fpc_distclean fpc_fpmakeclean .PHONY: fpc_clean fpc_cleanall fpc_distclean
ifdef EXEFILES ifdef EXEFILES
override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
@ -2116,8 +2116,6 @@ endif
fpc_distclean: cleanall fpc_distclean: cleanall
fpc_fpmakeclean: cleanall
[baseinforules] [baseinforules]
##################################################################### #####################################################################

6
utils/fpcm/fpcmwr.pp
View File

@ -34,7 +34,7 @@ interface
r_shared, r_shared,
r_install,r_sourceinstall,r_exampleinstall,r_distinstall, r_install,r_sourceinstall,r_exampleinstall,r_distinstall,
r_zipinstall,r_zipsourceinstall,r_zipexampleinstall,r_zipdistinstall, r_zipinstall,r_zipsourceinstall,r_zipexampleinstall,r_zipdistinstall,
r_clean,r_distclean,r_cleanall,r_fpmakeclean, r_clean,r_distclean,r_cleanall,
r_info,r_makefiles r_info,r_makefiles
); );
@ -46,7 +46,7 @@ interface
'shared', 'shared',
'install','sourceinstall','exampleinstall','distinstall', 'install','sourceinstall','exampleinstall','distinstall',
'zipinstall','zipsourceinstall','zipexampleinstall','zipdistinstall', 'zipinstall','zipsourceinstall','zipexampleinstall','zipdistinstall',
'clean','distclean','cleanall','fpmakeclean', 'clean','distclean','cleanall',
'info','makefiles' 'info','makefiles'
); );
@ -56,7 +56,7 @@ interface
sec_shared, sec_shared,
sec_install,sec_install,sec_install,sec_distinstall, sec_install,sec_install,sec_install,sec_distinstall,
sec_zipinstall,sec_zipinstall,sec_zipinstall,sec_zipinstall, sec_zipinstall,sec_zipinstall,sec_zipinstall,sec_zipinstall,
sec_clean,sec_clean,sec_clean,sec_clean, sec_clean,sec_clean,sec_clean,
sec_info,sec_makefile sec_info,sec_makefile
); );