Changeset 10057 in vbox

Timestamp:

Jul 1, 2008 1:54:58 AM (17 years ago)

Author:

vboxsync

Message:

Changed brute force _DEPS on each source to _INTERMEDIATES (PREREQS -> VBOX_MAIN_PREREQS).

File:

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

trunk/src/VBox/Main/Makefile.kmk

@@ -79 +79 @@
         $(PATH_VBoxCOM)/VirtualBox_i.c \
         $(PATH_VBoxCOM)/VirtualBox.tlb
-else
+ VBOX_MAIN_PREREQS = $(PATH_VBoxCOM)/VirtualBox_i.c
+else # xpcom
  INSTALLS       += xpcom-components
  IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox_XPCOM.idl
@@ -94 +95 @@
     $(IDLTYPELIB)
 
-endif
+ VBOX_MAIN_PREREQS = $(IDLTYPELIB) $(IDLHEADER)
+endif # xpcom
 
 
@@ -192 +194 @@
         adm \
         devinfo
+
+VBoxSVC_INTERMEDIATES = $(VBOX_MAIN_PREREQS)
 
 VBoxSVC_SOURCES = \
@@ -289 +293 @@
         $(PATH_VBoxC) \
         .
+VBoxSVCM_INTERMEDIATES  = $(VBOX_MAIN_PREREQS)
 VBoxSVCM_SOURCES        = \
         xpcom/server_module.cpp
@@ -304 +309 @@
         $(APPEND) $@ _NSGetModule
 endif
+VBoxSVCM_INTERMEDIATES = $(IDLHEADER)
 
 endif # VBOX_WITH_XPCOM
@@ -373 +379 @@
         $(LIB_VMM) \
         $(LIB_REM)
+
+VBoxC_INTERMEDIATES = $(VBOX_MAIN_PREREQS)
 
 VBoxC_SOURCES = \
@@ -457 +465 @@
 #
 VBoxCOM_TEMPLATE        = VBOXMAINLIB
+VBoxCOM_INTERMEDIATES   = $(VBOX_MAIN_PREREQS)
 VBoxCOM_SOURCES         = \
         glue/com.cpp \
@@ -477 +486 @@
 
 #
-# Generate _DEPS on all sources which depends on generated headers.
-#
-ifeq ($(KBUILD_TARGET),win)
-PREREQS = $(PATH_VBoxCOM)/VirtualBox_i.c
-else
-PREREQS = $(IDLTYPELIB) $(IDLHEADER)
-endif
-
-# brute force way to ensure the prereqs are generated before anything is compiled.
-define def_src_deps
-$(src)_ORDERDEPS += $(PREREQS)
-endef
-$(foreach src,\
-        $(VBoxC_SOURCES)   $(VBoxC_SOURCES.$(KBUILD_TARGET)) \
-        $(VBoxSVC_SOURCES) $(VBoxSVC_SOURCES.$(KBUILD_TARGET)) \
-        $(VBoxCOM_SOURCES) \
-        ,$(eval $(value def_src_deps)))
-
-
-#
 # Embed XML Schema files to VBoxSVC
 #
-
 VBOX_XML_SCHEMA_H               = $(PATH_TARGET)/xml_VirtualBox_settings_xsd.h
 VBOX_XML_SCHEMA_COMMON_H        = $(PATH_TARGET)/xml_VirtualBox_settings_common_xsd.h
@@ -667 +655 @@
 endif
 
-# bird: anyone still using this? If not it's a gonner.
-## Hack to work around wine's trouble with midl.exe and rc.exe (seems to be msvcrt.dll related)
-#gen: $(PREREQS)
-
 
 #