From b156dc5ad9d0d39572bd8f99355298d1cd275cb8 Mon Sep 17 00:00:00 2001 From: joost Date: Wed, 13 Jul 2011 21:07:23 +0000 Subject: [PATCH] * Use new fpmake distclean command. After all targets are cleaned by fpmake distclean, cleanup the fpmake executable git-svn-id: trunk@17987 - --- packages/fastcgi/Makefile | 14 +++++++++----- packages/fastcgi/Makefile.fpc | 7 ++++--- packages/fcl-web/Makefile | 14 +++++++++----- packages/fcl-web/Makefile.fpc | 7 ++++--- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/packages/fastcgi/Makefile b/packages/fastcgi/Makefile index 0044aa0b76..0a53afa33d 100644 --- a/packages/fastcgi/Makefile +++ b/packages/fastcgi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/07/10] # 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 @@ -284,6 +284,7 @@ export FPCFPMAKE export FPMAKE_SKIP_CONFIG endif else +FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif @@ -2021,7 +2022,7 @@ ifdef HASEXAMPLES endif fpc_zipdistinstall: $(MAKE) fpc_zipinstall ZIPTARGET=distinstall -.PHONY: fpc_clean fpc_cleanall fpc_distclean +.PHONY: fpc_clean fpc_cleanall fpc_distclean fpc_fpmakeclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) endif @@ -2093,6 +2094,7 @@ ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif fpc_distclean: cleanall +fpc_fpmakeclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo fpc_baseinfo: @@ -2211,9 +2213,10 @@ zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall cleanall: +fpmakeclean: info: fpc_info makefiles: fpc_makefiles -.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall fpmakeclean info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif @@ -2229,6 +2232,9 @@ debug: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG clean: $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +distclean: + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) + -$(DEL) $(LOCALFPMAKE) install: fpmake ifdef UNIXHier $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) @@ -2236,5 +2242,3 @@ else $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) endif distinstall: install -distclean: clean - -$(DEL) $(LOCALFPMAKE) diff --git a/packages/fastcgi/Makefile.fpc b/packages/fastcgi/Makefile.fpc index f6d68dddc5..fa23f1d2b0 100644 --- a/packages/fastcgi/Makefile.fpc +++ b/packages/fastcgi/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for FastCGI +# Makefile.fpc for running fpmake # [package] @@ -44,6 +44,9 @@ debug: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG clean: $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +distclean: + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) + -$(DEL) $(LOCALFPMAKE) install: fpmake ifdef UNIXHier $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) @@ -54,5 +57,3 @@ endif # Normally distinstall also installs the examples, but in this case there are # none. distinstall: install -distclean: clean - -$(DEL) $(LOCALFPMAKE) diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile index 19eb98c53f..5949e940be 100644 --- a/packages/fcl-web/Makefile +++ b/packages/fcl-web/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/07/10] # 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 @@ -284,6 +284,7 @@ export FPCFPMAKE export FPMAKE_SKIP_CONFIG endif else +FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif @@ -2021,7 +2022,7 @@ ifdef HASEXAMPLES endif fpc_zipdistinstall: $(MAKE) fpc_zipinstall ZIPTARGET=distinstall -.PHONY: fpc_clean fpc_cleanall fpc_distclean +.PHONY: fpc_clean fpc_cleanall fpc_distclean fpc_fpmakeclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) endif @@ -2093,6 +2094,7 @@ ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif fpc_distclean: cleanall +fpc_fpmakeclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo fpc_baseinfo: @@ -2211,9 +2213,10 @@ zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall cleanall: +fpmakeclean: info: fpc_info makefiles: fpc_makefiles -.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall fpmakeclean info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif @@ -2229,6 +2232,9 @@ debug: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG clean: $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +distclean: + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) + -$(DEL) $(LOCALFPMAKE) install: fpmake ifdef UNIXHier $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) @@ -2236,5 +2242,3 @@ else $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) endif distinstall: install -distclean: clean - -$(DEL) $(LOCALFPMAKE) diff --git a/packages/fcl-web/Makefile.fpc b/packages/fcl-web/Makefile.fpc index 0baa1c9432..b8468a0312 100644 --- a/packages/fcl-web/Makefile.fpc +++ b/packages/fcl-web/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for TDataSet for FCL +# Makefile.fpc for running fpmake # [package] @@ -44,6 +44,9 @@ debug: fpmake $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG clean: $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +distclean: + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) + -$(DEL) $(LOCALFPMAKE) install: fpmake ifdef UNIXHier $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) @@ -54,5 +57,3 @@ endif # Normally distinstall also installs the examples, but in this case there are # none. distinstall: install -distclean: clean - -$(DEL) $(LOCALFPMAKE)