Preliminary fix for allowing to build libraries in parallel

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29553 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2010-02-11 17:50:01 +00:00
parent 42287ed4ef
commit 5f32b1f53d
2 changed files with 17 additions and 3 deletions

View file

@ -1,3 +1,11 @@
2010-02-11 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/GNUmakefile: Compile Additions as a subproject before the
two libraries that are built on top of it. This will prevent
problems when libraries from the same GNUmakefile are built in
parallel.
(GNUmakefile.local): Do not try including this non-existing file.
2010-02-11 07:37-EST Gregory John Casamento <greg.casamento@gmail.com>
* install.sh: Removed configure.
@ -46,7 +54,6 @@
Partial implementation of NSOperationQueue (OSX Leopard functionality
plus a little of Snow Leopard).
>>>>>>> .r29544
2010-02-05 Riccardo Mottola <rmottola@users.sf.net>
* Headers/Additions/GNUstepBase/GSIMap.h: fixed c99-ism

View file

@ -464,10 +464,17 @@ libbase-resources_RESOURCE_FILES = Info-gnustep.plist
libgnustep-base_NEEDS_GUI = NO
libgnustep-baseadd_NEEDS_GUI = NO
# Build the Additions subproject first. It can then be used in by
# both gnustep-base and gnustep-baseadd (otherwise, if we ever build
# gnustep-base and gnustep-baseadd in parallel, they'd both try to
# build Additions as a subproject, causing concurrency issues). If it
# can be guaranteed that they'll never be built together, this could
# be removed.
SUBPROJECTS = Additions
-include Makefile.preamble
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/library.make
include $(GNUSTEP_MAKEFILES)/resource-set.make