Browse Source

* fixed (some?) missing dependencies

git-svn-id: trunk@8941 -
Jonas Maebe 18 years ago
parent
commit
5c2f23e433
2 changed files with 24 additions and 12 deletions
  1. 12 7
      packages/Makefile
  2. 12 5
      packages/Makefile.fpc

+ 12 - 7
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/20]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -108,7 +108,7 @@ ifndef FPC
 FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(FPCPROG),)
 FPCPROG:=$(firstword $(FPCPROG))
-FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
+FPC:=$(shell $(FPCPROG) -PB)
 ifneq ($(findstring Error,$(FPC)),)
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
 endif
@@ -3052,11 +3052,11 @@ fcl-json_debug: fcl-base_debug
 fcl-json_smart: fcl-base_smart
 fcl-json_release: fcl-base_release
 fcl-json_shared: fcl-base_shared
-fcl-image_all: fcl-base_all
-fcl-image_debug: fcl-base_debug
-fcl-image_smart: fcl-base_smart
-fcl-image_release: fcl-base_release
-fcl-image_shared: fcl-base_shared
+fcl-image_all: fcl-base_all paszlib_all
+fcl-image_debug: fcl-base_debug paszlib_debug
+fcl-image_smart: fcl-base_smart paszlib_smart
+fcl-image_release: fcl-base_release paszlib_release
+fcl-image_shared: fcl-base_shared paszlib_shared
 fcl-fpcunit_all: fcl-xml_all
 fcl-fpcunit_debug: fcl-xml_debug
 fcl-fpcunit_smart: fcl-xml_smart
@@ -3087,3 +3087,8 @@ fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_d
 fcl_smart: fcl-base_smart fcl-xml_smart fcl-fpcunit_smart fcl-db_smart fcl-web_smart fcl-registry_smart fcl-passrc_smart fcl-image_smart fcl-net_smart fcl-json_smart
 fcl_release: fcl-base_release fcl-xml_release fcl-fpcunit_release fcl-db_release fcl-web_release fcl-registry_release fcl-passrc_release fcl-image_release fcl-net_release fcl-json_release
 fcl_shared: fcl-base_shared fcl-xml_shared fcl-fpcunit_shared fcl-db_shared fcl-web_shared fcl-registry_shared fcl-passrc_shared fcl-image_shared fcl-net_shared fcl-json_shared
+paszlib_all: hash_all
+paszlib_debug: hash_debug
+paszlib_smart: hash_smart
+paszlib_release: hash_release
+paszlib_shared: hash_shared

+ 12 - 5
packages/Makefile.fpc

@@ -52,11 +52,11 @@ fcl-json_smart: fcl-base_smart
 fcl-json_release: fcl-base_release
 fcl-json_shared: fcl-base_shared
 
-fcl-image_all: fcl-base_all
-fcl-image_debug: fcl-base_debug
-fcl-image_smart: fcl-base_smart
-fcl-image_release: fcl-base_release
-fcl-image_shared: fcl-base_shared
+fcl-image_all: fcl-base_all paszlib_all
+fcl-image_debug: fcl-base_debug paszlib_debug
+fcl-image_smart: fcl-base_smart paszlib_smart
+fcl-image_release: fcl-base_release paszlib_release
+fcl-image_shared: fcl-base_shared paszlib_shared
 
 fcl-fpcunit_all: fcl-xml_all
 fcl-fpcunit_debug: fcl-xml_debug
@@ -94,3 +94,10 @@ fcl_smart: fcl-base_smart fcl-xml_smart fcl-fpcunit_smart fcl-db_smart fcl-web_s
 fcl_release: fcl-base_release fcl-xml_release fcl-fpcunit_release fcl-db_release fcl-web_release fcl-registry_release fcl-passrc_release fcl-image_release fcl-net_release fcl-json_release
 fcl_shared: fcl-base_shared fcl-xml_shared fcl-fpcunit_shared fcl-db_shared fcl-web_shared fcl-registry_shared fcl-passrc_shared fcl-image_shared fcl-net_shared fcl-json_shared
 
+paszlib_all: hash_all
+paszlib_debug: hash_debug
+paszlib_smart: hash_smart
+paszlib_release: hash_release
+paszlib_shared: hash_shared
+
+