Changeset 10268 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 5, 2008 6:22:21 AM (16 years ago)

Author:

vboxsync

Message:

Dropped the non-working webservices hack; just include sub-makefiles first like eveywhere else.

File:

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

trunk/src/VBox/Main/Makefile.kmk

@@ -27 +27 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-# Include sub-makefile(s) first if we're doing parallel building.
-# This is primarily a hack to try avoid idling all but one cpu when
-# building the gigant soap sources.
-ifneq ($(KMK_OPTS_JOBS),1)
- ifdef VBOX_WITH_WEBSERVICES
-  include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
- endif
- include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-endif
+# Include sub-makefile(s).
+ifdef VBOX_WITH_WEBSERVICES
+include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
+endif
+include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 
 # targets++
@@ -571 +567 @@
 
 
-#
-# 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)
- ifdef VBOX_WITH_WEBSERVICES
-  include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
- endif
- include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-endif
-
-