Browse Source

* Let the makefile create the unit output dir when fpmake.pp is not compiled yet

git-svn-id: trunk@17223 -
joost 14 years ago
parent
commit
029f5e9046
2 changed files with 7 additions and 3 deletions
  1. 4 2
      packages/fcl-web/Makefile
  2. 3 1
      packages/fcl-web/Makefile.fpc

+ 4 - 2
packages/fcl-web/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/01]
 #
 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
@@ -2133,7 +2133,9 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-fpmake: fpmake.pp
+$(COMPILER_UNITTARGETDIR):
+	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
+fpmake: $(COMPILER_UNITTARGETDIR) fpmake.pp
 	$(FPC) fpmake.pp $(FPCOPT)
 all:	fpmake
 	./fpmake build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)

+ 3 - 1
packages/fcl-web/Makefile.fpc

@@ -28,7 +28,9 @@ FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
 
 [rules]
-fpmake: fpmake.pp
+$(COMPILER_UNITTARGETDIR):
+        $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
+fpmake: $(COMPILER_UNITTARGETDIR) fpmake.pp
 	$(FPC) fpmake.pp $(FPCOPT)
 all:	fpmake
 	./fpmake build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)