Changeset 6772 in vbox

Timestamp:

Feb 3, 2008 10:01:11 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27862

Message:

A little adjustment of the put webservices-last hack.

File:

• trunk/src/VBox/Main/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -84 +84 @@
     $(IDLTYPELIB)
 
-endif
-
-# Include sub-makefile(s) last if we're not doing parallel building.
-ifeq ($(KMK_OPTS_JOBS),1)
- ifndef VBOX_OSE
-  include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
- endif
- include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 endif
 
@@ -534 +526 @@
 endif
 
-# generate
+
+#
+# Include sub-makefile(s) last if we're not doing parallel building.
+#
+# We do this here so that the webservices ends up last in the target 
+# lists. For 100% correctness we must do this after all the main 
+# targets has been fully fleshed out as subheader/footer.kmk will
+# process new targets.
+#
+ifeq ($(KMK_OPTS_JOBS),1)
+ ifndef VBOX_OSE
+  include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
+ endif
+ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+endif
+
+# generate rules
 include $(PATH_KBUILD)/subfooter.kmk