소스 검색

* custapp has univint deps on OS X.

git-svn-id: trunk@13911 -
marco 16 년 전
부모
커밋
c14fb4b1c8
2개의 변경된 파일31개의 추가작업 그리고 25개의 파일을 삭제
  1. 16 12
      packages/Makefile
  2. 15 13
      packages/Makefile.fpc

+ 16 - 12
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/10/02]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/10/18]
 #
 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 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -8563,11 +8563,19 @@ fpmkunit_debug: fcl-base_debug fcl-process_debug paszlib_debug
 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 $(FULL_TARGET),powerpc-darwin i386-darwin),)
+fcl-base_all: univint_all paszlib_all
+fcl-base_debug: univint_debug paszlib_debug
+fcl-base_smart: univint_smart paszlib_smart
+fcl-base_release: univint_release paszlib_release
+fcl-base_shared: univint_shared paszlib_shared
+else
 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
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 fcl-extra_all: fcl-base winunits-base_all winunits-jedi_all
 fcl-extra_debug: fcl-base_debug winunits-base_debug winunits-jedi_debug
@@ -8575,23 +8583,19 @@ fcl-extra_smart: fcl-base_smart winunits-base_smart winunits-jedi_smart
 fcl-extra_release: fcl-base_release winunits-base_release winunits-jedi_release
 fcl-extra_shared: fcl-base_shared winunits-base_shared winunits-jedi_shared
 else
+ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),)
+fcl-extra_all: univint_all fcl-base_all
+fcl-extra_debug: univint_debug fcl-base_debug
+fcl-extra_smart: univint_smart fcl-base_release
+fcl-extra_release: univint_release fcl-base_release
+fcl-extra_shared: univint_shared fcl-base_shared
+else
 fcl-extra_all: fcl-base_all
 fcl-extra_debug: fcl-base_debug
 fcl-extra_smart: fcl-base_smart
 fcl-extra_release: fcl-base_release
 fcl-extra_shared: fcl-base_shared
 endif
-ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),)
-fcl-extra_all: univint_all
-fcl-extra_debug: univint_debug
-fcl-extra_smart: univint_smart
-fcl-extra_release: univint_release
-fcl-extra_shared: univint_shared
-fcl-base_all: univint_all
-fcl-base_debug: univint_debug
-fcl-base_smart: univint_smart
-fcl-base_release: univint_release
-fcl-base_shared: univint_shared
 endif
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug

+ 15 - 13
packages/Makefile.fpc

@@ -74,11 +74,19 @@ 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 $(FULL_TARGET),powerpc-darwin i386-darwin),)
+fcl-base_all: univint_all paszlib_all
+fcl-base_debug: univint_debug paszlib_debug
+fcl-base_smart: univint_smart paszlib_smart
+fcl-base_release: univint_release paszlib_release
+fcl-base_shared: univint_shared paszlib_shared
+else
 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
 
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 fcl-extra_all: fcl-base winunits-base_all winunits-jedi_all
@@ -87,25 +95,19 @@ fcl-extra_smart: fcl-base_smart winunits-base_smart winunits-jedi_smart
 fcl-extra_release: fcl-base_release winunits-base_release winunits-jedi_release
 fcl-extra_shared: fcl-base_shared winunits-base_shared winunits-jedi_shared
 else
+ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),)
+fcl-extra_all: univint_all fcl-base_all
+fcl-extra_debug: univint_debug fcl-base_debug
+fcl-extra_smart: univint_smart fcl-base_release
+fcl-extra_release: univint_release fcl-base_release
+fcl-extra_shared: univint_shared fcl-base_shared
+else
 fcl-extra_all: fcl-base_all
 fcl-extra_debug: fcl-base_debug
 fcl-extra_smart: fcl-base_smart
 fcl-extra_release: fcl-base_release
 fcl-extra_shared: fcl-base_shared
 endif
-
-ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),)
-fcl-extra_all: univint_all
-fcl-extra_debug: univint_debug
-fcl-extra_smart: univint_smart
-fcl-extra_release: univint_release
-fcl-extra_shared: univint_shared
-
-fcl-base_all: univint_all
-fcl-base_debug: univint_debug
-fcl-base_smart: univint_smart
-fcl-base_release: univint_release
-fcl-base_shared: univint_shared
 endif
 
 fcl-xml_all: fcl-base_all