Changeset 599 in vbox

Timestamp:

Feb 4, 2007 6:30:58 PM (18 years ago)

Author:

vboxsync

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

18226

Message:

Added a couple of missing build order dependencies. (kmk -j 4 did't work from xpcom18a4)

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (5 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -88 +88 @@
                                      # -Wl,--whole-archive,--no-allow-shlib-undefined
 TEMPLATE_XPCOM_LIBS.l4             = $(VBOX_GCC_LIBGCC)
-TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
+TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst))) \
+                                     $(PATH_VBox-xpcom-string)/idl_ts
 
 
@@ -142 +143 @@
                                           $(PATH_BIN)/sdk/include/xpcom/xpcom \
                                           $(PATH_BIN)/sdk/include/xpcom/ipcd
-TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(TEMPLATE_XPCOM_ORDERDEPS)
+TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
 
 
@@ -1280 +1281 @@
 
 # combined typelib library
-$(PATH_BIN)/VBoxXPCOMBase.xpt: $(XPTFILES)
+$(PATH_BIN)/VBoxXPCOMBase.xpt: $(XPTFILES) | $(TARGET_xp_link)
         $(call MSG_L1,Linking $@)
         $(QUIET)$(TARGET_xpt_link) $@ $^
@@ -1303 +1304 @@
 define def_IDL
 $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(idl)))) \
-            $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): $(idl)
+            $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): $(idl) | $(TARGET_xpidl)
         $$(call MSG_L1,xpidl $$<)
         $$(QUIET)$(MKDIR) -p $(PATH_BIN)/sdk/include $(PATH_BIN)/sdk/idl
@@ -1322 +1323 @@
 xpcom/string/src/nsAString.cpp: $(PATH_VBox-xpcom-string)/idl_ts
 
-#/home/bird/pdp8/coding/vbox/svn/trunk/out/linux.x86/release/obj/src/libs/xpcom18a4/VBoxXPCOMGlue/xpcom/glue/nsMemory.o