Changeset 36401 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2011 1:16:30 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70755

Message:

VBoxBFE: The testcase/Makefile.kmk is *NOT* allowed to reference variables defined by the parent makefile, that *BREAKS* running make in the testcase subdirectory. tstMouseImpl must use the INTERMEDIATES property just like VBoxBFE to make sure the headers are generated before sources are built, that's probably what caused the build break that r70348 and others tried to fix.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• Makefile.kmk (modified) (5 diffs)
• testcase/Makefile.kmk (deleted)
• testcase/Makefile.kup (added)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
-
-#
-# Include sub-makefile(s).
-#
-include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-
 if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin"  # No hardened VBoxBFE on darwin (.m).
 
@@ -80 +74 @@
         VMControl.cpp \
         $(addprefix $(VBoxBFE_0_OUTDIR)/,$(notdir $(VBOXBFE_MAIN_SRCS)))
-
-$(VBoxBFE_SOURCES): \
-    $(addprefix $$(VBoxBFE_0_OUTDIR)/,$(notdir $(VBOXBFE_MAIN_HDRS)))
 
 ifdef VBOX_WITH_HGCM
@@ -176 +167 @@
 
 # Files we share with Main needs to be copied into the output dir.
-VBoxBFE_INTERMEDIATES += $(addprefix $(VBoxBFE_0_OUTDIR)/,$(VBOXBFE_MAIN_HDRS))
+VBoxBFE_INTERMEDIATES  = $(addprefix $(VBoxBFE_0_OUTDIR)/, $(VBOXBFE_MAIN_HDRS))
 VBoxBFE_CLEAN         += $(addprefix $(VBoxBFE_0_OUTDIR)/, $(VBOXBFE_MAIN_HDRS) $(notdir $(VBOXBFE_MAIN_SRCS)))
 
@@ -189 +180 @@
 
 
+if !defined(VBOX_ONLY_SDK) && defined(VBOX_WITH_TESTCASES)
+ #
+ # tstMouseImpl
+ #
+ PROGRAMS += tstMouseImpl
+ tstMouseImpl_TEMPLATE = VBOXR3TSTEXE
+ tstMouseImpl_DEFS = VBOXBFE_WITHOUT_COM
+ tstMouseImpl_SOURCES  = \
+        testcase/tstMouseImpl.cpp \
+        $(addprefix $(VBoxBFE_0_OUTDIR)/,$(notdir $(VBOXBFE_MAIN_SRCS)))
+ tstMouseImpl_INCS     = \
+        $(VBoxBFE_0_OUTDIR) \
+        $(VBOX_PATH_SDK)/include \
+        .
+ tstMouseImpl_INTERMEDIATES = $(addprefix $(VBoxBFE_0_OUTDIR)/, $(VBOXBFE_MAIN_HDRS))
+endif # !VBOX_ONLY_SDK
+
+
 endif # !VBOX_WITH_HARDENING || !darwin
 include $(KBUILD_PATH)/subfooter.kmk