Changeset 12248 in vbox

Timestamp:

Sep 9, 2008 1:21:58 AM (16 years ago)

Author:

vboxsync

Message:

VMM/Makefiles: Eliminated PATH_TARGET usage and pushed them up to root level (sub-makefile wise).

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (6 diffs)
• testcase/Makefile.kmk (modified) (15 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../..
-else
-DEPTH     = ../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -214 +210 @@
 endif
 ifeq ($(VBOX_LDR_FMT32),lx)
-VMMGCBuiltin_SOURCES = $(PATH_TARGET)/VMMGCBuiltin.def
-$(PATH_TARGET)/VMMGCBuiltin.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGCBuiltin.def | $(call DIRDEP,$(PATH_TARGET))
-        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' $< > [email protected]
-        $(MV) -f [email protected] $@
+VMMGCBuiltin_SOURCES = $(PATH_VMMGCBuiltin)/VMMGCBuiltin.def
+$$(PATH_VMMGCBuiltin)/VMMGCBuiltin.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGCBuiltin.def | $$(dir $$@)
+        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $<
 endif
 
@@ -230 +225 @@
 endif
 ifeq ($(VBOX_LDR_FMT32),lx)
-VMMGCImp_SOURCES = $(PATH_TARGET)/VMMGC.def
-$(PATH_TARGET)/VMMGC.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGC.def | $(call DIRDEP,$(PATH_TARGET))
-        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' $< > [email protected]
-        $(APPEND) "[email protected]" ""
-        $(APPEND) "[email protected]" "    ___ehInit"
-        $(MV) -f [email protected] $@
+VMMGCImp_SOURCES = $(PATH_VMMGCImp)/VMMGC.def
+$$(PATH_VMMGCImp)/VMMGC.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGC.def | $$(dir $$@)
+        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@  $<
+        $(APPEND) "$@" ""
+        $(APPEND) "$@" "    ___ehInit"
 endif
 
@@ -251 +245 @@
  endif
  ifeq ($(VBOX_LDR_FMT),lx)
-VMMR0Imp_SOURCES = $(PATH_TARGET)/VMMR0.def
-$(PATH_TARGET)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $(call DIRDEP,$(PATH_TARGET))
-        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' $< > [email protected]
-        $(APPEND) "[email protected]" ""
-        $(APPEND) "[email protected]" "    ___ehInit"
-        $(MV) -f [email protected] $@
+VMMR0Imp_SOURCES = $(PATH_VMMR0Imp)/VMMR0.def
+$$(PATH_VMMR0Imp)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
+        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /'  --output $@ $<
+        $(APPEND) "$@" ""
+        $(APPEND) "$@" "    ___ehInit"
  endif
 endif # R0: pe + lx
@@ -338 +331 @@
 endif
 ifeq ($(VBOX_LDR_FMT32),lx)
-VMMGC_SOURCES += $(PATH_TARGET)/VMMGC.def
+VMMGC_SOURCES += $(PATH_VMMGCImp)/VMMGC.def
 endif
 
@@ -416 +409 @@
 endif
 ifeq ($(VBOX_LDR_FMT),lx)
-VMMR0_SOURCES += $(PATH_TARGET)/VMMR0.def
+VMMR0_SOURCES += $(PATH_VMMR0Imp)/VMMR0.def
 endif
 

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

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -47 +42 @@
 endif
 
+# Where we put our temporary files (just for simplicity)
+VBOX_VMM_TESTCASE_OUT_DIR := $(PATH_TARGET)/VMM
+BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
 
 #
@@ -55 +53 @@
  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
   OTHERS += \
-        $(PATH_TARGET)/tstAsmStructs.run \
-        $(PATH_TARGET)/tstVMStructSize.run
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
  endif
 endif
@@ -62 +60 @@
 # The normal testing pass.
 TESTING += \
-        $(PATH_TARGET)/tstAsmStructs.run \
-        $(PATH_TARGET)/tstVMStructSize.run
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
 
 OTHER_CLEAN += \
-        $(PATH_TARGET)/tstAsmStructs.run \
-        $(PATH_TARGET)/tstVMStructSize.run \
-        $(PATH_TARGET)/tstAsmStructs.h \
-        $(PATH_TARGET)/tstAsmStructsAsm.o \
-        $(PATH_TARGET)/tstAsmStructsAsm.mac \
-        $(PATH_TARGET)/tstAsmStructsAsm.mac.o \
-        $(PATH_TARGET)/tstAsmStructsAsm.mac.lst \
-        $(PATH_TARGET)/tstAsmStructs.h.dump \
-        $(PATH_TARGET)/tstAsmStructsGC.h \
-        $(PATH_TARGET)/tstAsmStructsHC.h \
-        $(PATH_TARGET)/tstVMStructGC.h
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.h \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.o \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac.o \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac.lst \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.h.dump \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsGC.h \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h \
+        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h
 
 #
@@ -99 +97 @@
 tstVMStructSize_DEFS   += VBOX_WITH_IDT_PATCHING
 endif
-tstVMStructSize_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM $(PATH_TARGET)
+tstVMStructSize_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstVMStructSize_SOURCES = tstVMStructSize.cpp
-tstVMStructSize.cpp_DEPS= $(PATH_TARGET)/tstVMStructGC.h
+tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h
 
 tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST
@@ -108 +106 @@
 tstAsmStructs_DEFS     += VBOX_WITH_IDT_PATCHING
 endif
-tstAsmStructs_INCS      = $(VBOX_PATH_VMM_SRC) $(PATH_TARGET)
+tstAsmStructs_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstAsmStructs_SOURCES   = tstAsmStructs.cpp
 
@@ -116 +114 @@
 tstAsmStructsGC_DEFS    += VBOX_WITH_IDT_PATCHING
 endif
-tstAsmStructsGC_INCS    = $(VBOX_PATH_VMM_SRC) $(PATH_TARGET)
+tstAsmStructsGC_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstAsmStructsGC_SOURCES = tstAsmStructs.cpp
 
-tstAsmStructs.cpp_DEPS  = $(PATH_TARGET)/tstAsmStructsHC.h $(PATH_TARGET)/tstAsmStructsGC.h
+tstAsmStructs.cpp_DEPS  = $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsGC.h
 
 
@@ -227 +225 @@
                 ) \
                 -f $(if $(eq $(KBUILD_TARGET),darwin),macho,elf) \
-                $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(PATH_TARGET),-I$(inc)/)
+                $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(VBOX_VMM_TESTCASE_OUT_DIR),-I$(inc)/)
 
 # 1a. make a header file which makes all the structures+members globals.
-$(PATH_TARGET)/tstAsmStructsAsm.mac: \
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac: \
                 $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm.asm \
                 $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed \
@@ -242 +240 @@
                 $(VBOX_PATH_VMM_SRC)/testcase/Makefile.kmk \
                 $(PATH_ROOT)/Config.kmk $(LOCALCFG) $(AUTOCFG) \
-                | $(call DIRDEP,$(PATH_TARGET))
+                | $$(dir $$@)
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
 ifndef DONT_USE_YASM
@@ -256 +254 @@
 
 # 1b. make an elf/macho object containing the offsets.
-$(PATH_TARGET)/tstAsmStructsAsm.o: \
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.o: \
                 $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm.asm \
-                $(PATH_TARGET)/tstAsmStructsAsm.mac \
+                $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac \
                 $(VBOX_PATH_VMM_SRC)/testcase/Makefile.kmk \
-                | $(call DIRDEP,$(PATH_TARGET))
+                | $$(dir $$@)
         $(call MSG_COMPILE,tstAsmStructsasm,$<,$@,AS)
 ifndef DONT_USE_YASM
@@ -269 +267 @@
 
 # 2. use nm and sed to transform this into the header we want.
-$(PATH_TARGET)/tstAsmStructsHC.h: $(PATH_TARGET)/tstAsmStructsAsm.o
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h: $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.o
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
         $(QUIET)$(RM) -f $@ [email protected] [email protected]
@@ -283 +281 @@
 
 # 3. transform the HC header into a GC one by omitting some HC only structures.
-$(PATH_TARGET)/tstAsmStructsGC.h: $(PATH_TARGET)/tstAsmStructsHC.h
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsGC.h: $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
         $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' --output $@ $^
@@ -291 +289 @@
 
 # 4. run it.
-$(PATH_TARGET)/tstAsmStructs.run: $$(INSTARGET_tstAsmStructs) $$(INSTARGET_tstAsmStructsGC)
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run: $$(INSTARGET_tstAsmStructs) $$(INSTARGET_tstAsmStructsGC)
         $(QUIET)$(RM) -f $@
         $(INSTARGET_tstAsmStructs)
@@ -304 +302 @@
 
 # 1. Manually dump selected structures and members.
-$(PATH_TARGET)/tstVMStructGC.h: $$(INSTARGET_tstVMStructGC)
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h: $$(INSTARGET_tstVMStructGC)
         $(call MSG_GENERATE,tstVMStructSize,$@)
         $(QUIET)$(REDIRECT) -wo $@ -- $^
 
 # 2. run it.
-$(PATH_TARGET)/tstVMStructSize.run: $$(INSTARGET_tstVMStructSize)
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run: $$(INSTARGET_tstVMStructSize)
         $(QUIET)$(RM) -f $@
         $^
@@ -315 +313 @@
 
 # alias for the two struct tests.
-run-struct-tests: $(PATH_TARGET)/tstAsmStructs.run $(PATH_TARGET)/tstVMStructSize.run
-
+run-struct-tests: $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+