Changeset 49909 in vbox

Timestamp:

Dec 15, 2013 3:50:59 PM (11 years ago)

Author:

vboxsync

Message:

Main/*.kmk: Moved a couple of global variables into Config.kmk so the testcase/Makefile.kmk can use them. Using variables from a parent makefile in a sub-makefile is absolutely illegal! (If it affects compilation in anyway.)

Location:

trunk/src/VBox/Main

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Config.kmk

@@ -30 +30 @@
 VBOX_MAIN_APIWRAPPER_INCS := $(VBOX_MAIN_APIWRAPPER_DIR)
 
+
+# The header is required by a testcase, that why these defines are here.
+VBOX_XML_SCHEMADEFS_H   = $(PATH_TARGET)/Main/SchemaDefs.h
+VBOX_XML_SCHEMADEFS_CPP = $(PATH_TARGET)/Main/SchemaDefs.cpp
+VBOX_XML_SCHEMADEFS_XSL = $(VBOX_PATH_MAIN_SRC)/xml/SchemaDefs.xsl
+
+# These files are also required by a testcase.
+VBOX_AUTOGEN_EVENT_H    = $(PATH_TARGET)/Main/VBoxEvents.h
+VBOX_AUTOGEN_EVENT_CPP  = $(PATH_TARGET)/Main/VBoxEvents.cpp
+
+

trunk/src/VBox/Main/Makefile.kmk

@@ -237 +237 @@
 #
 BLDDIRS += $(PATH_TARGET)/Main
-VBOX_XML_SCHEMADEFS_H   = $(PATH_TARGET)/Main/SchemaDefs.h
-VBOX_XML_SCHEMADEFS_CPP = $(PATH_TARGET)/Main/SchemaDefs.cpp
-VBOX_XML_SCHEMADEFS_XSL = $(VBOX_PATH_MAIN_SRC)/xml/SchemaDefs.xsl
-
-VBOX_AUTOGEN_EVENT_H    = $(PATH_TARGET)/Main/VBoxEvents.h
-VBOX_AUTOGEN_EVENT_CPP  = $(PATH_TARGET)/Main/VBoxEvents.cpp
 
 testschemadefs: $(VBOX_XML_SCHEMADEFS_H) $(VBOX_XML_SCHEMADEFS_CPP)