From 9ce6e8f8015860aabfa1fc87d0770f7ab634e833 Mon Sep 17 00:00:00 2001 From: joost Date: Mon, 24 Aug 2015 20:29:38 +0000 Subject: [PATCH] * Removed the fpmkunit_bootstrap target because it forces building fpmake in all circumstances which breaks 'make sourcezip'. In fact a revert of r29249. git-svn-id: trunk@31400 - --- packages/Makefile | 7 +++---- packages/Makefile.fpc | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index 0b3ad58bf7..0349c7e41f 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-07-28 rev 31240] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-08-12 rev 31317] # 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 i386-android i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos aarch64-linux aarch64-darwin @@ -1683,11 +1683,10 @@ ifndef BUILDFULLNATIVE FPMAKE_OPT+=-sp endif .NOTPARALLEL: -fpmkunit_bootstrap: - $(MAKE) -C fpmkunit bootstrap fpmkunit_clean_bootstrap: $(MAKE) -C fpmkunit clean_bootstrap -fpmake$(SRCEXEEXT): fpmake.pp fpmkunit_bootstrap $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc +fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc + $(MAKE) -C fpmkunit bootstrap $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) all: fpmake$(SRCEXEEXT) $(LOCALFPMAKE) compile $(FPMAKE_OPT) diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 14ee3d9071..3174426c81 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -68,11 +68,10 @@ FPMAKE_OPT+=-sp endif .NOTPARALLEL: -fpmkunit_bootstrap: - $(MAKE) -C fpmkunit bootstrap fpmkunit_clean_bootstrap: $(MAKE) -C fpmkunit clean_bootstrap -fpmake$(SRCEXEEXT): fpmake.pp fpmkunit_bootstrap $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc +fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc + $(MAKE) -C fpmkunit bootstrap $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) all: fpmake$(SRCEXEEXT) $(LOCALFPMAKE) compile $(FPMAKE_OPT)