Changeset 12268 in vbox

Timestamp:

Sep 9, 2008 3:43:51 AM (17 years ago)

Author:

vboxsync

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

36267

Message:

Devices/Makefiles: PATH_TARGET elimination, push up to root (sub-makefile wise). Some minor cleanups.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/BIOS/Makefile.kmk (modified) (6 diffs)
• Makefile.kmk (modified) (4 diffs)
• PC/BIOS/Makefile.kmk (modified) (4 diffs)
• Storage/testcase/Makefile.kmk (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-SUB_DEPTH = ../..
-DEPTH    ?= ../../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
+#
+# Globals
+#
 VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
 
@@ -46 +44 @@
 VgaBiosBin_DEFS     = IN_VBOXDD2
 VgaBiosBin_INCS     = $(VBOX_PATH_DEVICES_SRC)
-VgaBiosBin_SOURCES  = $(PATH_TARGET)/VgaBiosBin.c
+VgaBiosBin_SOURCES  = $(PATH_VgaBiosBin)/VgaBiosBin.c
 VgaBiosBin_CLEAN    = \
-        $(PATH_TARGET)/vbetables.h \
+        $(PATH_VgaBiosBin)/vbetables.h \
         \
-        $(PATH_TARGET)/_vgabios_.c \
-        $(PATH_TARGET)/vgabios0.s \
-        $(PATH_TARGET)/vgabios1.s \
-        $(PATH_TARGET)/vgabios.tmp \
-        $(PATH_TARGET)/vgabios.lst \
-        $(PATH_TARGET)/vgabios.bin \
-        $(PATH_TARGET)/VgaBiosBin.c \
-        $(PATH_TARGET)/VgaDefBiosLogo.c \
+        $(PATH_VgaBiosBin)/_vgabios_.c \
+        $(PATH_VgaBiosBin)/vgabios0.s \
+        $(PATH_VgaBiosBin)/vgabios1.s \
+        $(PATH_VgaBiosBin)/vgabios.tmp \
+        $(PATH_VgaBiosBin)/vgabios.lst \
+        $(PATH_VgaBiosBin)/vgabios.bin \
+        $(PATH_VgaBiosBin)/VgaBiosBin.c \
+        $(PATH_VgaBiosBin)/VgaDefBiosLogo.c \
         \
-        $(PATH_TARGET)/_vgabios-cirrus_.c \
-        $(PATH_TARGET)/vgabios-cirrus0.s \
-        $(PATH_TARGET)/vgabios-cirrus1.s \
-        $(PATH_TARGET)/vgabios-cirrus.tmp \
-        $(PATH_TARGET)/vgabios-cirrus.lst \
-        $(PATH_TARGET)/vgabios-cirrus.bin
+        $(PATH_VgaBiosBin)/_vgabios-cirrus_.c \
+        $(PATH_VgaBiosBin)/vgabios-cirrus0.s \
+        $(PATH_VgaBiosBin)/vgabios-cirrus1.s \
+        $(PATH_VgaBiosBin)/vgabios-cirrus.tmp \
+        $(PATH_VgaBiosBin)/vgabios-cirrus.lst \
+        $(PATH_VgaBiosBin)/vgabios-cirrus.bin
 
 #
 # Rule for making the bios.
 #
-$(PATH_TARGET)/VgaBiosBin.c: $(PATH_TARGET)/vgabios.bin $(VBOX_BIN2C)
+$$(PATH_VgaBiosBin)/VgaBiosBin.c: $$(PATH_VgaBiosBin)/vgabios.bin $(VBOX_BIN2C)
         $(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
         $(QUIET)$(VBOX_BIN2C) -min 32 -max 64 -mask 0x0fff -ascii -export VgaBiosBinary $< $@
@@ -78 +76 @@
 
 # 1. create vbetables.h
-$(PATH_TARGET)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen)
+$$(PATH_VgaBiosBin)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen)
         $(QUIET)$(REDIRECT) -wo $@ -- $(TARGET_vbetables-gen)
 
 # 2. precompile
-$(PATH_TARGET)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $(PATH_TARGET)/vbetables.h $(VBOX_VERSION_STAMP)
+$$(PATH_VgaBiosBin)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(PATH_VgaBiosBin)/vbetables.h $(VBOX_VERSION_STAMP)
         $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@)
         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -o $@ $<
@@ -88 +86 @@
 # 3. compile
 # BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
-$(PATH_TARGET)/vgabios0.s: $(PATH_TARGET)/_vgabios_.c | $(VBOX_BCC_JOBS)
+$$(PATH_VgaBiosBin)/vgabios0.s: $$(PATH_VgaBiosBin)/_vgabios_.c | $(VBOX_BCC_JOBS)
         $(call MSG_COMPILE,VgaBiosBin,$<,$@,C)
         $(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $^
-VBOX_BCC_JOBS += $(PATH_TARGET)/vgabios0.s
+VBOX_BCC_JOBS += $(PATH_VgaBiosBin)/vgabios0.s
 
 # 4. preprocess intermediate assembly.
-$(PATH_TARGET)/vgabios1.s: $(PATH_TARGET)/vgabios0.s
+$$(PATH_VgaBiosBin)/vgabios1.s: $$(PATH_VgaBiosBin)/vgabios0.s
         $(call MSG_TOOL,Adjusting BCC Assembly,VgaBiosBin,$<,$@)
         $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
 
 # 5. assemble
-$(PATH_TARGET)/vgabios.tmp $(PATH_TARGET)/vgabios.lst: $(PATH_TARGET)/vgabios1.s
+$$(PATH_VgaBiosBin)/vgabios.tmp $$(PATH_VgaBiosBin)/vgabios.lst: $$(PATH_VgaBiosBin)/vgabios1.s
         $(call MSG_COMPILE,VgaBiosBin,$<,$@,AS)
-        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/vgabios.lst
+        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_VgaBiosBin)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_VgaBiosBin)/vgabios.lst
 
 # 6. checksums
-$(PATH_TARGET)/vgabios.bin: $(PATH_TARGET)/vgabios.tmp $$(TARGET_vgabiossums)
+$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(TARGET_vgabiossums)
         $(call MSG_TOOL,vgabiossums,VgaBiosBin,$<,$@)
-        $(QUIET)$(CP) -f $(PATH_TARGET)/vgabios.tmp $@
+        $(QUIET)$(CP) -f $(PATH_VgaBiosBin)/vgabios.tmp $@
         $(QUIET)$(TARGET_vgabiossums) $@
 
@@ -115 +113 @@
 VgaDefBiosLogo_TEMPLATE  = VBOXR3
 VgaDefBiosLogo_INCS      = $(VBOX_PATH_DEVICES_SRC)
-VgaDefBiosLogo_SOURCES   = $(PATH_TARGET)/VgaDefBiosLogo.c
+VgaDefBiosLogo_SOURCES   = $(PATH_VgaBiosBin)/VgaDefBiosLogo.c
 
 #
@@ -121 +119 @@
 #
 ifdef VBOX_OSE
-VBOX_LOGO_FILE := ose_logo.bmp
+ VBOX_LOGO_FILE := ose_logo.bmp
 else
-VBOX_LOGO_FILE := sun_logo.bmp
+ VBOX_LOGO_FILE := sun_logo.bmp
 endif
-$(PATH_TARGET)/VgaDefBiosLogo.c: $(PATH_SUB_CURRENT)/$(VBOX_LOGO_FILE) $(VBOX_BIN2C)
+$$(PATH_VgaBiosBin)/VgaDefBiosLogo.c: $(PATH_SUB_CURRENT)/$(VBOX_LOGO_FILE) $(VBOX_BIN2C)
         $(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
         $(QUIET)$(VBOX_BIN2C) VgaDefBiosLogo $< $@

trunk/src/VBox/Devices/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../..
-else
-DEPTH     = ../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -325 +321 @@
 DevicesR3_DEFS.l4      += _GNU_SOURCE
 
-# DevACPI.cpp needs vboxaml.hex which we generate from PC/vbox.dsl.
-DevicesR3_CLEAN        += $(PATH_TARGET)/vboxaml.hex $(PATH_TARGET)/vboxaml.aml
-PC/DevACPI.cpp_DEPS     = $(PATH_TARGET)/vboxaml.hex
-PC/DevACPI.cpp_INCS     = $(PATH_TARGET)
-
-$(PATH_TARGET)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl
+# DevACPI.cpp needs vboxaml.hex which we generate from PC/vbox.dsl. (bird: What's vboxaml.aml?)
+DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
+PC/DevACPI.cpp_DEPS     = $(PATH_DevicesR3)/vboxaml.hex
+PC/DevACPI.cpp_INCS     = $(PATH_DevicesR3)
+
+$$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
         $(call MSG_TOOL,iasl,DevicesR3,$<,$@)
         $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
@@ -338 +334 @@
 
 # For finding and generating vbetables.h (see Graphics/BIOS/Makefile.kmk).
-Graphics/DevVGA.cpp_INCS = $(PATH_TARGET)
-Graphics/DevVGA.cpp_DEPS = $(PATH_TARGET)/vbetables.h
+Graphics/DevVGA.cpp_INCS = $(PATH_VgaBiosBin)
+Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
 
 
@@ -898 +894 @@
 
 include $(KBUILD_PATH)/subfooter.kmk
+

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-SUB_DEPTH = ../..
-DEPTH    ?= ../../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
+#
+# Globals
+#
 VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
 
@@ -45 +43 @@
 PcBiosBin_DEFS      = IN_VBOXDD2
 PcBiosBin_INCS      = $(VBOX_PATH_DEVICES_SRC)
-PcBiosBin_SOURCES   = $(PATH_TARGET)/PcBiosBin.c
-$(PATH_TARGET)/PcBiosBin.c_DEPS = $(PATH_TARGET)/pcbios-syms.h
+PcBiosBin_SOURCES   = $(PATH_PcBiosBin)/PcBiosBin.c
+PcBiosBin_DEPS      = $(PATH_PcBiosBin)/pcbios-syms.h
 PcBiosBin_CLEAN     = \
-        $(PATH_TARGET)/_rombios_.c \
-        $(PATH_TARGET)/rombios0.s \
-        $(PATH_TARGET)/rombios1.s \
-        $(PATH_TARGET)/pcbios.lst \
-        $(PATH_TARGET)/pcbios.tmp \
-        $(PATH_TARGET)/pcbios.bin \
-        $(PATH_TARGET)/PcBiosBin.c \
-        $(PATH_TARGET)/pcbios-syms.h
+        $(PATH_PcBiosBin)/_rombios_.c \
+        $(PATH_PcBiosBin)/rombios0.s \
+        $(PATH_PcBiosBin)/rombios1.s \
+        $(PATH_PcBiosBin)/pcbios.lst \
+        $(PATH_PcBiosBin)/pcbios.tmp \
+        $(PATH_PcBiosBin)/pcbios.bin \
+        $(PATH_PcBiosBin)/PcBiosBin.c \
+        $(PATH_PcBiosBin)/pcbios-syms.h
 
 #
 # Rule for making the bios.
 #
-$(PATH_TARGET)/PcBiosBin.c: $(PATH_TARGET)/pcbios.bin $(VBOX_BIN2C)
+$$(PATH_PcBiosBin)/PcBiosBin.c: $$(PATH_PcBiosBin)/pcbios.bin $(VBOX_BIN2C)
         $(call MSG_TOOL,bin2c,PcBiosBin,$<,$@)
         $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $< $@
@@ -69 +67 @@
 
 # 1. precompile rombios.c
-$(PATH_TARGET)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c $(PATH_SUB_CURRENT)/apmbios.S \
-                $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h | $(call DIRDEP,$(PATH_TARGET))
+$$(PATH_PcBiosBin)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c $(PATH_SUB_CURRENT)/apmbios.S \
+                $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h | $$(dir $@)
         $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
-        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -P -o $@ $<
+        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_PcBiosBin) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -P -o $@ $<
 
 # 2. compile to intermediate asm file.
 # BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
-$(PATH_TARGET)/rombios0.s: $(PATH_TARGET)/_rombios_.c $(VBOX_VERSION_STAMP) | $(VBOX_BCC_JOBS)
+$$(PATH_PcBiosBin)/rombios0.s: $$(PATH_PcBiosBin)/_rombios_.c $(VBOX_VERSION_STAMP) | $(VBOX_BCC_JOBS)
         $(call MSG_COMPILE,PcBiosBin,$<,$@,C)
         $(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $<
-VBOX_BCC_JOBS += $(PATH_TARGET)/rombios0.s
+VBOX_BCC_JOBS += $(PATH_PcBiosBin)/rombios0.s
 
 # 3. post process intermediate asm file.
-$(PATH_TARGET)/rombios1.s: $(PATH_TARGET)/rombios0.s
+$$(PATH_PcBiosBin)/rombios1.s: $$(PATH_PcBiosBin)/rombios0.s
         $(call MSG_TOOL,Adjusting BCC Assembly,PcBiosBin,$<,$@)
         $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
 
 # 4. assemble the intermediate asm file. (also creates a listing rombios.lst)
-$(PATH_TARGET)/pcbios.tmp $(PATH_TARGET)/pcbios.lst: $(PATH_TARGET)/rombios1.s
+$$(PATH_PcBiosBin)/pcbios.tmp + $$(PATH_PcBiosBin)/pcbios.lst: $$(PATH_PcBiosBin)/rombios1.s
         $(call MSG_COMPILE,PcBiosBin,$<,$@,AS)
-        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst
+        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_PcBiosBin)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_PcBiosBin)/pcbios.lst
 
 # 5. calculate checksums for the final BIOS image.
-$(PATH_TARGET)/pcbios.bin: $(PATH_TARGET)/pcbios.tmp $$(TARGET_pcbiossums)
+$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(TARGET_pcbiossums)
         $(call MSG_TOOL,pcbiossums,PcBiosBin,$<,$@)
-        $(QUIET)$(CP) -f $(PATH_TARGET)/pcbios.tmp $(PATH_TARGET)/pcbios.bin
-        $(QUIET)$(TARGET_pcbiossums) $(PATH_TARGET)/pcbios.bin
+        $(QUIET)$(CP) -f $(PATH_PcBiosBin)/pcbios.tmp $(PATH_PcBiosBin)/pcbios.bin
+        $(QUIET)$(TARGET_pcbiossums) $(PATH_PcBiosBin)/pcbios.bin
 
 # 6. create the symbol table.
-$(PATH_TARGET)/pcbios-syms.h: $(PATH_TARGET)/pcbios.lst $(MAKEFILE_CURRENT)
+$$(PATH_PcBiosBin)/pcbios-syms.h: $$(PATH_PcBiosBin)/pcbios.lst $(MAKEFILE_CURRENT)
         $(call MSG_GENERATE,PcBiosBin,$<,$@)
         $(QUIET)$(SED) \
@@ -104 +102 @@
                 -e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
                 --output $@ \
-                $(PATH_TARGET)/pcbios.lst
+                $(PATH_PcBiosBin)/pcbios.lst
 
 

trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-SUB_DEPTH = ../..
-DEPTH    ?= ../../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -41 +36 @@
  vditool_LIBS     = $(LIB_DDU) $(LIB_RUNTIME)
 endif
-vditool_SOURCES  = vditool.cpp
+vditool_SOURCES   = vditool.cpp
 
 

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

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
+
+#
+# Globals
+#
+VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
+VBOX_DEVICES_TEST_OUT_DIR := $(VBOX_DEVICES_TEST_OUT_DIR)/Devices/testcase
+BLDDIRS += $(VBOX_DEVICES_TEST_OUT_DIR)
 
 #
@@ -35 +37 @@
  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
   OTHERS += \
-        $(PATH_TARGET)/tstDeviceStructSize.run
+        $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
  endif
 endif
@@ -41 +43 @@
 # The normal testing pass.
 TESTING += \
-        $(PATH_TARGET)/tstDeviceStructSize.run
+        $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
 
-
-#
-# Globals
-#
-VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
 
 #
@@ -71 +68 @@
         $(VBOX_PATH_DEVICES_SRC) \
         $(VBOX_PATH_DEVICES_SRC)/Bus \
-        $(PATH_TARGET)
+        $(VBOX_DEVICES_TEST_OUT_DIR)
 
 #
@@ -94 +91 @@
         $(VBOX_PATH_DEVICES_SRC) \
         $(VBOX_PATH_DEVICES_SRC)/Bus \
-        $(PATH_TARGET)
+        $(VBOX_DEVICES_TEST_OUT_DIR)
 tstDeviceStructSize_SOURCES  = tstDeviceStructSize.cpp
 tstDeviceStructSize_CLEAN    = \
-        $(PATH_TARGET)/tstDeviceStructSizeGC.h \
-        $(PATH_TARGET)/tstDeviceStructSizeGC.run
-tstDeviceStructSize.cpp_DEPS = $(PATH_TARGET)/tstDeviceStructSizeGC.h
+        $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.h \
+        $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.run
+tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.h
 
 #
@@ -110 +107 @@
 
 # 1&2. Manually dump selected structures and members.
-$(PATH_TARGET)/tstDeviceStructSizeGC.h: $$(INSTARGET_tstDeviceStructSizeGC)
+$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.h: $$(INSTARGET_tstDeviceStructSizeGC) | $$(dir $$@)
         $(call MSG_GENERATE,,$@)
         $(QUIET)$(REDIRECT) -wo $@ -- $^
 
 # 3. run it.
-$(PATH_TARGET)/tstDeviceStructSize.run: $$(INSTARGET_tstDeviceStructSize)
+$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run: $$(INSTARGET_tstDeviceStructSize) | $$(dir $$@)
         $(QUIET)$(RM) -f $@
         $^
@@ -121 +118 @@
 
 # alias for the struct test.
-run-struct-tests: $(PATH_TARGET)/tstDeviceStructSize.run
+run-struct-tests: $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run