Przeglądaj źródła

--- Merging r19166 into '.':
C packages/Makefile
U packages/Makefile.fpc
Summary of conflicts:
Text conflicts: 1

# revisions: 19166
------------------------------------------------------------------------
r19166 | jonas | 2011-09-21 14:33:09 +0200 (Wed, 21 Sep 2011) | 4 lines
Changed paths:
M /trunk/packages/Makefile
M /trunk/packages/Makefile.fpc

* fixed errors with make -j <high number> caused by a wrong fpvectorial
dependency rule resulting in fcl-base to be concurrently compiled multiple
times

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@19209 -

marco 14 lat temu
rodzic
commit
799e0301ed
2 zmienionych plików z 7 dodań i 3 usunięć
  1. 6 2
      packages/Makefile
  2. 1 1
      packages/Makefile.fpc

+ 6 - 2
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/09/11]
 #
 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
@@ -188,7 +188,11 @@ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
 else
+ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)
+TARGETSUFFIX=$(OS_TARGET)
+else
 TARGETSUFFIX=$(FULL_TARGET)
+endif
 SOURCESUFFIX=$(FULL_SOURCE)
 endif
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -9717,7 +9721,7 @@ fcl-image_release: fcl-base_release paszlib_release pasjpeg_release
 fcl-image_shared: fcl-base_shared paszlib_shared pasjpeg_shared
 fpvectorial_all: fcl-image_all fcl-base_all
 fpvectorial_debug: fcl-image_debug fcl-base_debug
-fpvectorial_smart: fcl-image_smart fcl-base_all
+fpvectorial_smart: fcl-image_smart fcl-base_smart
 fpvectorial_release: fcl-image_release fcl-base_release 
 fpvectorial_shared: fcl-image_shared fcl-base_shared
 fcl-fpcunit_all: fcl-xml_all paszlib_all

+ 1 - 1
packages/Makefile.fpc

@@ -168,7 +168,7 @@ fcl-image_shared: fcl-base_shared paszlib_shared pasjpeg_shared
 
 fpvectorial_all: fcl-image_all fcl-base_all
 fpvectorial_debug: fcl-image_debug fcl-base_debug
-fpvectorial_smart: fcl-image_smart fcl-base_all
+fpvectorial_smart: fcl-image_smart fcl-base_smart
 fpvectorial_release: fcl-image_release fcl-base_release 
 fpvectorial_shared: fcl-image_shared fcl-base_shared