Avoid including MakeChunk filefor clean'ing targets

git-svn-id: trunk@23949 -
This commit is contained in:
pierre 2013-03-21 11:44:48 +00:00
parent e621bff943
commit 889181c4a5
2 changed files with 35 additions and 120 deletions

View File

@ -1,10 +1,10 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/03/20] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/23]
# #
default: allexectests default: allexectests
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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android 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
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku aix UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
OSNeedsComspecToRunBatch = go32v2 watcom OSNeedsComspecToRunBatch = go32v2 watcom
FORCE: FORCE:
@ -178,12 +178,6 @@ else
ARCH=$(CPU_TARGET) ARCH=$(CPU_TARGET)
endif endif
endif endif
ifeq ($(FULL_TARGET),arm-embedded)
ifeq ($(SUBARCH),)
$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
endif
override FPCOPT+=-Cp$(SUBARCH)
endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
TARGETSUFFIX=$(OS_TARGET) TARGETSUFFIX=$(OS_TARGET)
SOURCESUFFIX=$(OS_SOURCE) SOURCESUFFIX=$(OS_SOURCE)
@ -209,14 +203,6 @@ endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
linuxHier=1 linuxHier=1
endif endif
ifndef CROSSCOMPILE
BUILDFULLNATIVE=1
export BUILDFULLNATIVE
endif
ifdef BUILDFULLNATIVE
BUILDNATIVE=1
export BUILDNATIVE
endif
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
ifdef FPCDIR ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR)) override FPCDIR:=$(subst \,/,$(FPCDIR))
@ -266,22 +252,7 @@ ifndef BINUTILSPREFIX
ifndef CROSSBINDIR ifndef CROSSBINDIR
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
ifndef DARWIN2DARWIN ifndef DARWIN2DARWIN
ifneq ($(CPU_TARGET),jvm)
BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
ifeq ($(OS_TARGET),android)
ifeq ($(CPU_TARGET),arm)
BINUTILSPREFIX=arm-linux-androideabi-
else
ifeq ($(CPU_TARGET),i386)
BINUTILSPREFIX=i686-linux-android-
else
ifeq ($(CPU_TARGET),mips)
BINUTILSPREFIX=mipsel-linux-android-
endif
endif
endif
endif
endif
endif endif
endif endif
endif endif
@ -381,9 +352,6 @@ endif
ifeq ($(FULL_TARGET),i386-iphonesim) ifeq ($(FULL_TARGET),i386-iphonesim)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),i386-android)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
@ -432,9 +400,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-wii) ifeq ($(FULL_TARGET),powerpc-wii)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),powerpc-aix)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
@ -453,15 +418,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),x86_64-netbsd)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),x86_64-solaris) ifeq ($(FULL_TARGET),x86_64-solaris)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),x86_64-openbsd)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
@ -495,9 +454,6 @@ endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),arm-android)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
@ -507,9 +463,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),powerpc64-aix)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),avr-embedded) ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
@ -519,18 +472,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),mips-linux)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),mipsel-linux) ifeq ($(FULL_TARGET),mipsel-linux)
override TARGET_PROGRAMS+=gparmake override TARGET_PROGRAMS+=gparmake
endif endif
ifeq ($(FULL_TARGET),jvm-java)
override TARGET_PROGRAMS+=gparmake
endif
ifeq ($(FULL_TARGET),jvm-android)
override TARGET_PROGRAMS+=gparmake
endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)
@ -760,14 +704,6 @@ SHAREDLIBEXT=.dll
SHORTSUFFIX=wat SHORTSUFFIX=wat
IMPORTLIBPREFIX= IMPORTLIBPREFIX=
endif endif
ifneq ($(CPU_TARGET),jvm)
ifeq ($(OS_TARGET),android)
BATCHEXT=.sh
EXEEXT=
HASSHAREDLIB=1
SHORTSUFFIX=lnx
endif
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
@ -892,25 +828,6 @@ EXEEXT=.dol
SHAREDLIBEXT=.so SHAREDLIBEXT=.so
SHORTSUFFIX=wii SHORTSUFFIX=wii
endif endif
ifeq ($(OS_TARGET),aix)
BATCHEXT=.sh
EXEEXT=
SHORTSUFFIX=aix
endif
ifeq ($(OS_TARGET),java)
OEXT=.class
ASMEXT=.j
SHAREDLIBEXT=.jar
SHORTSUFFIX=java
endif
ifeq ($(CPU_TARGET),jvm)
ifeq ($(OS_TARGET),android)
OEXT=.class
ASMEXT=.j
SHAREDLIBEXT=.jar
SHORTSUFFIX=android
endif
endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FPCMADE=fpcmade.$(SHORTSUFFIX) FPCMADE=fpcmade.$(SHORTSUFFIX)
ZIPSUFFIX=$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX)
@ -1143,6 +1060,25 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
else else
DATESTR= DATESTR=
endif endif
ifndef UPXPROG
ifeq ($(OS_TARGET),go32v2)
UPXPROG:=1
endif
ifeq ($(OS_TARGET),win32)
UPXPROG:=
endif
ifdef UPXPROG
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(UPXPROG),)
UPXPROG=
else
UPXPROG:=$(firstword $(UPXPROG))
endif
else
UPXPROG=
endif
endif
export UPXPROG
ZIPOPT=-9 ZIPOPT=-9
ZIPEXT=.zip ZIPEXT=.zip
ifeq ($(USETAR),bz2) ifeq ($(USETAR),bz2)
@ -1219,9 +1155,6 @@ endif
ifeq ($(FULL_TARGET),i386-iphonesim) ifeq ($(FULL_TARGET),i386-iphonesim)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),i386-android)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1270,9 +1203,6 @@ endif
ifeq ($(FULL_TARGET),powerpc-wii) ifeq ($(FULL_TARGET),powerpc-wii)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),powerpc-aix)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1291,15 +1221,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),x86_64-netbsd)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),x86_64-solaris) ifeq ($(FULL_TARGET),x86_64-solaris)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),x86_64-openbsd)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1333,9 +1257,6 @@ endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),arm-android)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1345,9 +1266,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),powerpc64-aix)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),avr-embedded) ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1357,18 +1275,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),mips-linux)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),mipsel-linux) ifeq ($(FULL_TARGET),mipsel-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),jvm-java)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),jvm-android)
REQUIRE_PACKAGES_RTL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -1418,7 +1327,6 @@ override FPCOPT+=-P$(ARCH)
endif endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
endif endif
ifndef CROSSBOOTSTRAP ifndef CROSSBOOTSTRAP
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
@ -1428,11 +1336,6 @@ ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-Xr$(RLINKPATH) override FPCOPT+=-Xr$(RLINKPATH)
endif endif
endif endif
ifndef CROSSCOMPILE
ifneq ($(BINUTILSPREFIX),)
override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
endif
endif
ifdef UNITDIR ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif endif
@ -1519,12 +1422,17 @@ endif
endif endif
ifdef CREATESHARED ifdef CREATESHARED
override FPCOPT+=-Cg override FPCOPT+=-Cg
ifeq ($(CPU_TARGET),i386)
override FPCOPT+=-Aas
endif endif
endif
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
ifeq ($(CPU_TARGET),x86_64) ifeq ($(CPU_TARGET),x86_64)
override FPCOPT+=-Cg override FPCOPT+=-Cg
endif endif
endif endif
endif
ifdef LINKSHARED ifdef LINKSHARED
endif endif
ifdef OPT ifdef OPT
@ -1681,6 +1589,9 @@ endif
fpc_install: all $(INSTALLTARGET) fpc_install: all $(INSTALLTARGET)
ifdef INSTALLEXEFILES ifdef INSTALLEXEFILES
$(MKDIR) $(INSTALL_BINDIR) $(MKDIR) $(INSTALL_BINDIR)
ifdef UPXPROG
-$(UPXPROG) $(INSTALLEXEFILES)
endif
$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
endif endif
ifdef INSTALL_CREATEPACKAGEFPC ifdef INSTALL_CREATEPACKAGEFPC
@ -1853,6 +1764,7 @@ fpc_baseinfo:
@$(ECHO) Date...... $(DATE) @$(ECHO) Date...... $(DATE)
@$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) FPCMake... $(FPCMAKE)
@$(ECHO) PPUMove... $(PPUMOVE) @$(ECHO) PPUMove... $(PPUMOVE)
@$(ECHO) Upx....... $(UPXPROG)
@$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) Zip....... $(ZIPPROG)
@$(ECHO) @$(ECHO)
@$(ECHO) == Object info == @$(ECHO) == Object info ==
@ -2257,11 +2169,13 @@ $(MAKEINC): $(GPARMAKE) $(TEST_OUTPUTDIR)
$(Q)$(GPARMAKE) -a $(MAKEINC) tbf 15000 $(CHUNKSIZE) $(sort $(wildcard tbf/t*.pp)) $(Q)$(GPARMAKE) -a $(MAKEINC) tbf 15000 $(CHUNKSIZE) $(sort $(wildcard tbf/t*.pp))
$(Q)$(GPARMAKE) -a $(MAKEINC) webtbs 20000 $(CHUNKSIZE) $(sort $(wildcard webtbs/t*.pp)) $(Q)$(GPARMAKE) -a $(MAKEINC) webtbs 20000 $(CHUNKSIZE) $(sort $(wildcard webtbs/t*.pp))
$(Q)$(GPARMAKE) -a $(MAKEINC) webtbf 30000 $(CHUNKSIZE) $(sort $(wildcard webtbf/t*.pp)) $(Q)$(GPARMAKE) -a $(MAKEINC) webtbf 30000 $(CHUNKSIZE) $(sort $(wildcard webtbf/t*.pp))
ifeq (,$(findstring clean,$(firstword $(MAKECMDGOALS))))
ifneq (,$(findstring all,$(MAKECMDGOALS))) ifneq (,$(findstring all,$(MAKECMDGOALS)))
ifneq (,$(wildcard $(MAKEINC))) ifneq (,$(wildcard $(MAKEINC)))
include $(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc include $(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
endif endif
endif endif
endif
allexectests: $(MAKEINC) allexectests: $(MAKEINC)
$(MAKE) gparmake_allexectests $(MAKE) gparmake_allexectests
endif endif

View File

@ -501,13 +501,14 @@ $(MAKEINC): $(GPARMAKE) $(TEST_OUTPUTDIR)
# only include the targets to compile/run the tests when we want to # only include the targets to compile/run the tests when we want to
# run them (in particular: not when cleaning) # run them (in particular: not when cleaning)
ifeq (,$(findstring clean,$(firstword $(MAKECMDGOALS))))
ifneq (,$(findstring all,$(MAKECMDGOALS))) ifneq (,$(findstring all,$(MAKECMDGOALS)))
ifneq (,$(wildcard $(MAKEINC))) ifneq (,$(wildcard $(MAKEINC)))
# incude the rules we just generated # incude the rules we just generated
include $(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc include $(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
endif endif
endif endif
endif
# this is pretty cool: MakeChunks-$(TEST_TARGETSUFFIX).inc will contain # this is pretty cool: MakeChunks-$(TEST_TARGETSUFFIX).inc will contain
# additional prerequisites for the allexectests target, and after it is # additional prerequisites for the allexectests target, and after it is