Changeset 9207 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 28, 2008 5:51:04 PM (17 years ago)

Author:

vboxsync

Message:

Use the (relatively) new INTERMEDIATES property to make sure the include files are all generated before the compiling starts.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -408 +408 @@
 XIDLFILE            = ../../Main/idl/VirtualBox.xidl
 
+VirtualBox_INTERMEDIATES += $(WRAPPERSFILE)
+
 
 # generated files we need to clean manually
@@ -534 +536 @@
 
 $(target)_GENHDRS_REAL += $(mocinc)
+$(target)_INTERMEDIATES += $(mocinc)
 
 $(mocobj): $(mocinc)
 
-.NOTPARALLEL: $(mocinc)
 $(mocinc): $(mocsrc)
         $$(call MSG_TOOL,moc,$(target),$(mocsrc),$$@)
@@ -552 +554 @@
 
 $(eval uisrc    := $(PATH_$(target))/ui/$(notdir $(basename $(basename $(mocuihdr)))).cpp)
-$(eval uiobj    := $(PATH_$(target)_$$(uisrc))/$(notdir $(basename $$(uisrc)))$(VBOX_SUFF_OBJ))
 $(eval mocuiinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocuihdr))).moc)
 
 $(target)_GENHDRS_REAL += $(mocuiinc)
-
-.NOTPARALLEL: $(mocuiinc)
+$(target)_INTERMEDIATES += $(mocuiinc)
+
 $(uisrc): $(mocuiinc)
 $(mocuiinc): $(mocuihdr)
@@ -577 +578 @@
 $(target)_GENSRCS_REAL += $(uisrc) $(mocsrc)
 $(target)_GENHDRS_REAL += $(uihdr)
-
-.NOTPARALLEL: $(uihdr)
+$(target)_INTERMEDIATES += $(uihdr)
+
 $(uihdr): $(uifile) | $$(call DIRDEP,$(dir $(uihdr)))
         $$(call MSG_TOOL,uic,$(target),$(uifile),$$@)
@@ -644 +645 @@
 
 # Generate COM Wrappers
-.NOTPARALLEL: $(WRAPPERSFILE) $(WRAPPERSINCFILE)
-
 $(WRAPPERSINCFILE): $(WRAPPERSFILE)