Changeset 10046 in vbox for trunk/src/VBox

Timestamp:

Jul 1, 2008 12:23:31 AM (17 years ago)

Author:

vboxsync

Message:

Drop the .NOTPARALLEL hack (windows), this should work fine now. VBOX_KBUILD_HACKING.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (3 diffs)
• testcase/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -20 +20 @@
 #
 
-DEPTH = ../../..
+ifdef VBOX_KBUILD_HACKING
+SUB_DEPTH = ../../..
+else
+DEPTH     = ../../..
+endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -51 +55 @@
 endif
 VMMR3_INCS     := \
-        PATM \
-        $(PATH_SUB_CURRENT)
+        $(PATH_SUB_CURRENT) \
+        PATM
 
 VMMR3_SOURCES   = \
@@ -271 +275 @@
 VMMGC_TEMPLATE  = VBOXGC
 VMMGC_INCS     := \
-         $(PATH_SUB_CURRENT) \
-         VMMGC \
-     PATM
+        $(PATH_SUB_CURRENT) \
+        VMMGC \
+        PATM
 VMMGC_DEFS      = IN_VMM_GC IN_PDM_GC IN_CFGM_GC IN_IOM_GC IN_MM_GC IN_RT_GC IN_TRPM_GC IN_SELM_GC IN_VM_GC IN_IOM_GC IN_DIS_GC DIS_CORE_ONLY IN_PGM_GC IN_CPUM_GC IN_EM_GC IN_TM_GC IN_PATM_GC IN_CSAM_GC IN_REM_GC IN_DBGF_GC
 ifdef VBOX_WITH_IDT_PATCHING

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -20 +20 @@
 #
 
-DEPTH ?= ../../../..
+ifdef VBOX_KBUILD_HACKING
+SUB_DEPTH = ../../../..
+else
 SUB_DEPTH = ..
+DEPTH    ?= ../../../..
+endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -77 +81 @@
 # Globals
 #
-VBOX_PATH_VMM_SRC = $(PATH_SUB_ROOT)
+VBOX_PATH_VMM_SRC = $(PATH_ROOT)/src/VBox/VMM
 
 #
@@ -202 +206 @@
 include $(KBUILD_PATH)/subfooter.kmk
 
-
-ifndef USE_MULTI_TARGET
-# temporary hack.
-.NOTPARALLEL: $(TARGET_tstMicroGC) $(LIB_VMMGC)
-endif