Browse Source

* base removed makefile changes

git-svn-id: trunk@10066 -
marco 17 years ago
parent
commit
cbbbc69b8c
2 changed files with 21 additions and 23 deletions
  1. 11 12
      packages/Makefile
  2. 10 11
      packages/Makefile.fpc

+ 11 - 12
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/27]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -7198,17 +7198,16 @@ fpmkunit_smart: fcl-base_smart fcl-process_smart paszlib_smart
 fpmkunit_release: fcl-base_release fcl-process_release paszlib_release
 fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
-fcl-base_all: base_all winunits-base_all winunits-jedi_all
-fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
-fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
-fcl-base_release: base_release winunits-base_release winunits-jedi_release
-fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
-else
-fcl-base_all: base_all
-fcl-base_debug: base_debug
-fcl-base_smart: base_smart
-fcl-base_release: base_release
-fcl-base_shared: base_shared
+fcl-base_all: paszlib_all winunits-base_all winunits-jedi_all
+fcl-base_debug: paszlib_debug winunits-base_debug winunits-jedi_debug
+fcl-base_smart: paszlib_smart winunits-base_smart winunits-jedi_smart
+fcl-base_release: paszlib_release winunits-base_release winunits-jedi_release
+fcl-base_shared: paszlib_shared winunits-base_shared winunits-jedi_shared
+fcl-base_all: paszlib_all
+fcl-base_debug: paszlib_debug
+fcl-base_smart: paszlib_smart
+fcl-base_release: paszlib_release
+fcl-base_shared: paszlib_shared
 endif
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug

+ 10 - 11
packages/Makefile.fpc

@@ -64,17 +64,16 @@ fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared
 
 
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
-fcl-base_all: base_all winunits-base_all winunits-jedi_all
-fcl-base_debug: base_debug winunits-base_debug winunits-jedi_debug
-fcl-base_smart: base_smart winunits-base_smart winunits-jedi_smart
-fcl-base_release: base_release winunits-base_release winunits-jedi_release
-fcl-base_shared: base_shared winunits-base_shared winunits-jedi_shared
-else
-fcl-base_all: base_all
-fcl-base_debug: base_debug
-fcl-base_smart: base_smart
-fcl-base_release: base_release
-fcl-base_shared: base_shared
+fcl-base_all: paszlib_all winunits-base_all winunits-jedi_all
+fcl-base_debug: paszlib_debug winunits-base_debug winunits-jedi_debug
+fcl-base_smart: paszlib_smart winunits-base_smart winunits-jedi_smart
+fcl-base_release: paszlib_release winunits-base_release winunits-jedi_release
+fcl-base_shared: paszlib_shared winunits-base_shared winunits-jedi_shared
+fcl-base_all: paszlib_all
+fcl-base_debug: paszlib_debug
+fcl-base_smart: paszlib_smart
+fcl-base_release: paszlib_release
+fcl-base_shared: paszlib_shared
 endif
 
 fcl-xml_all: fcl-base_all