Changeset 9208 in vbox for trunk/src

Timestamp:

May 28, 2008 5:52:10 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/VirtualBox4/Makefile.kmk (modified) (8 diffs)

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

@@ -678 +678 @@
 XIDLFILE            = ../../Main/idl/VirtualBox.xidl
 
+VirtualBox_INTERMEDIATES = $(WRAPPERSFILE)
+
 
 # generated files we need to clean manually
@@ -801 +803 @@
 
 $(target)_GENSRCS_REAL += $(mocsrc)
+## @todo The source should be added to GEN_SOURCES: $ (target)_GEN_SOURCES += $ (mocsrc)
 
 $(mocsrc): $(mochdr)
@@ -822 +825 @@
 
 $(target)_GENHDRS_REAL += $(mocinc)
+$(target)_INTERMEDIATES += $(mocinc)
 
 $(mocobj): $(mocinc)
 
-.NOTPARALLEL: $(mocinc)
 $(mocinc): $(mocsrc)
         $$(call MSG_TOOL,moc,$(target),$(mocsrc),$$@)
@@ -847 +850 @@
 
 $(target)_GENHDRS_REAL += $(mocuiinc)
-
-.NOTPARALLEL: $(mocuiinc)
+$(target)_INTERMEDIATES += $(mocuiinc)
+
 $(uisrc): $(mocuiinc)
 $(mocuiinc): $(mocuihdr)
@@ -869 +872 @@
 $(eval mocsrc := $(PATH_$(target))/moc/moc_$(notdir $(basename $(uifile))).cpp)
 
+
 $(target)_GENSRCS_REAL += $(uisrc) $(mocsrc)
 $(target)_GENHDRS_REAL += $(uihdr)
-
-.NOTPARALLEL: $(uihdr)
+$(target)_INTERMEDIATES += $(uihdr)
+## @todo The source should be added to GEN_SOURCES: $ (target)_GEN_SOURCES += $ (uisrc) $ (mocsrc)
+
 $(uihdr): $(uifile) | $$(call DIRDEP,$(dir $(uihdr)))
         $$(call MSG_TOOL,uic,$(target),$(uifile),$$@)
@@ -900 +905 @@
 
 $(target)_GENHDRS_REAL += $(uihdr)
-
-.NOTPARALLEL: $(uihdr)
+$(target)_INTERMEDIATES += $(uihdr)
+
 $(uihdr): $(uifile) | $$(call DIRDEP,$(dir $(uihdr)))
         $$(call MSG_TOOL,uic,$(target),$(uifile),$$@)
@@ -965 +970 @@
 
 # Generate COM Wrappers
-.NOTPARALLEL: $(WRAPPERSFILE) $(WRAPPERSINCFILE)
-
 $(WRAPPERSINCFILE): $(WRAPPERSFILE)
 
@@ -976 +979 @@
         $(call MSG_MKDIR,$@)
         $(QUIET)$(MKDIR) -p $@
-
-# this is actually necessary only for Win32 target with disabled dependencies
-define def_wrapper_deps
-$(src): $(WRAPPERSFILE) $(WRAPPERSINCFILE)
-endef
-
-$(foreach src,$(VirtualBox_SOURCES),$(eval $(def_wrapper_deps)))
 
 # rules for resources file creation