Author: infinoid
Date: Sun Mar 30 11:24:33 2008
New Revision: 26643
Modified:
trunk/config/gen/makefiles/root.in
Log:
[Makefile] The pdd17pmc branch merge broke "make -j2".
* Add some missing build interdependencies, so make knows what it can and can't
build in parallel.
* Now "make -j2" seems to work pretty reliably for me... more testing is on the
way.
* This change shouldn't have any effect on non-parallel builds.
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Sun Mar 30 11:24:33 2008
@@ -850,7 +850,15 @@
$(SRC_DIR)/install_config$(O) : $(SRC_DIR)/install_config.c
-$(SRC_DIR)/null_config.$(O) : $(SRC_DIR)/null_config.c
+$(SRC_DIR)/null_config$(O) : $(SRC_DIR)/null_config.c
+
+$(SRC_DIR)/oo$(O) : $(SRC_DIR)/pmc/class.c $(INC_DIR)/pbcversion.h
+
+$(SRC_DIR)/scheduler$(O) : $(SRC_DIR)/scheduler.str \
+ $(SRC_DIR)/pmc/scheduler.c \
+ $(SRC_DIR)/pmc/task.c \
+ $(SRC_DIR)/pmc/timer.c \
+ $(INC_DIR)/pbcversion.h
lib_deps_object : $(O_FILES)
$(PERL) tools/dev/lib_deps.pl object $(O_FILES)
@@ -1328,9 +1336,9 @@
#
###############################################################################
-compilers : $(GEN_LIBRARY) compilers.dummy
+compilers : compilers.dummy
-compilers.dummy : $(PARROT)
+compilers.dummy : $(PARROT) $(GEN_LIBRARY)
$(MAKE) compilers/pge
$(MAKE) compilers/tge
$(MAKE) compilers/past-pm
