Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk (revision 37800) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk (revision 37801) @@ -47,8 +47,8 @@ $(call VBOX_EDIT_INF_FN,$<,$@) -$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(TARGET_VBoxVideo) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(TARGET_VBoxDisp) | $$(dir $$@) +$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) @@ -123,13 +123,13 @@ $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG)) -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(TARGET_VBoxVideoWddm) | $$(dir $$@) +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(VBoxVideoWddm_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) ifdef VBOXWDDM_WITH_DISPD3D -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(TARGET_VBoxDispD3D) | $$(dir $$@) +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) ifeq ($(KBUILD_TARGET_ARCH),amd64) -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(TARGET_VBoxDispD3D-x86) | $$(dir $$@) +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) endif @@ -137,57 +137,57 @@ ifdef VBOXWDDM_WITH_GL -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(TARGET_VBoxOGL) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $$(TARGET_VBoxD3D9wddm) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $$(TARGET_wined3dwddm) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(TARGET_VBoxOGLarrayspu) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(TARGET_VBoxOGLcrutil) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(TARGET_VBoxOGLerrorspu) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(TARGET_VBoxOGLfeedbackspu) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(TARGET_VBoxOGLpackspu) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(TARGET_VBoxOGLpassthroughspu) | $$(dir $$@) +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) ifeq ($(KBUILD_TARGET_ARCH), amd64) -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(TARGET_VBoxOGL-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(TARGET_VBoxD3D9wddm-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(TARGET_wined3dwddm-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(TARGET_VBoxOGLarrayspu-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(TARGET_VBoxOGLcrutil-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(TARGET_VBoxOGLerrorspu-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(TARGET_VBoxOGLfeedbackspu-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(TARGET_VBoxOGLpackspu-x86) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - -$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(TARGET_VBoxOGLpassthroughspu-x86) | $$(dir $$@) +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) endif Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk (revision 37800) +++ /trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk (revision 37801) @@ -61,7 +61,7 @@ $(call VBOX_EDIT_INF_FN,$<,$@) -$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf $$(TARGET_VBoxMouse) +$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf $$(VBoxMouse_1_TARGET) $(call MSG_TOOL,Inf2Cat,VBoxMouse-inf,$@,$<) - $(INSTALL) -m 644 $(TARGET_VBoxMouse) $(@D) + $(INSTALL) -m 644 $(VBoxMouse_1_TARGET) $(@D) $(call VBOX_MAKE_CAT_FN, $(@D),$@) endif # signing Index: /trunk/src/VBox/HostDrivers/Support/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/Support/Makefile.kmk (revision 37800) +++ /trunk/src/VBox/HostDrivers/Support/Makefile.kmk (revision 37801) @@ -220,5 +220,5 @@ $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat -$(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys: $$(TARGET_VBoxDrv) | $$(dir $$@) +$(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys: $$(VBoxDrv_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) @@ -378,5 +378,5 @@ os2/SUPDrv-os2.def VBoxDrv_LIBS = \ - $(TARGET_VBoxDrvLib) \ + $(VBoxDrvLib_1_TARGET) \ $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ $(VBOX_GCC_LIBGCC) \ Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (revision 37800) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (revision 37801) @@ -53,5 +53,5 @@ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ - $(TARGET_usbd) + $(usbd_1_TARGET) # @@ -85,5 +85,5 @@ $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \ - $(TARGET_usbd) + $(usbd_1_TARGET) # @@ -101,5 +101,5 @@ $(LIB_RUNTIME) \ $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ - $(TARGET_VBoxDrvCfg) + $(VBoxDrvCfg_1_TARGET) @@ -118,5 +118,5 @@ $(LIB_RUNTIME) \ $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ - $(TARGET_VBoxDrvCfg) + $(VBoxDrvCfg_1_TARGET) # @@ -134,5 +134,5 @@ $(LIB_RUNTIME) \ $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \ - $(TARGET_VBoxDrvCfg) + $(VBoxDrvCfg_1_TARGET) # @@ -164,5 +164,5 @@ $(PATH_TARGET)/VBoxUSBMonCat.dir/VBoxUSBMon.sys -$(PATH_TARGET)/VBoxUSBCat.dir/VBoxUSB.sys: $$(TARGET_VBoxUSB) | $$(dir $$@) +$(PATH_TARGET)/VBoxUSBCat.dir/VBoxUSB.sys: $$(VBoxUSB_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) @@ -173,5 +173,5 @@ $(call VBOX_MAKE_CAT_FN, $(@D),$@) -$(PATH_TARGET)/VBoxUSBMonCat.dir/VBoxUSBMon.sys: $$(TARGET_VBoxUSBMon) | $$(dir $$@) +$(PATH_TARGET)/VBoxUSBMonCat.dir/VBoxUSBMon.sys: $$(VBoxUSBMon_1_TARGET) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D)