Changeset 10201 in vbox

Timestamp:

Jul 4, 2008 4:46:17 AM (16 years ago)

Author:

vboxsync

Message:

Use TARGET_xpidl instead of VBOX_XPIDL, and make VBOX_XPIDL wait on all the IDL files to be processed. This is to make sure main doesn't try process its IDL file too early. (VBOX_SINGLE_MAKEFILE)

File:

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

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1543 +1543 @@
 + $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): \
                 $(VBOX_PATH_XPCOM_SRC)/$(idl) \
-                | $$(TARGET_xpidl)
+                | $$$$(TARGET_xpidl)
         $$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@)
         $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/include $(VBOX_PATH_SDK)/idl
-        $$(QUIET)$$(VBOX_XPIDL) -m header $(XPIDL_INCS) -e $$@ $$<
-        $$(QUIET)$$(VBOX_XPIDL) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
+        $$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<
+        $$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
         $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/idl
 endef
@@ -1559 +1559 @@
         $(QUIET)$(ECHO_EXT) > $@
 
+# Make sure main doesn't start using xpidl before we're done with the idl files here.
+$(VBOX_XPIDL): $$(PATH_VBox-xpcom-string)/idl_ts
+
 # Manual dependency...
 xpcom/string/src/nsAString.cpp: $(PATH_VBox-xpcom-string)/idl_ts