Changeset 35380 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 30, 2010 4:06:17 PM (14 years ago)

Author:

vboxsync

Message:

Makefiles: The PATH_<target> variable is deprated, use <target>_0_OUTDIR instead.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Installer/Loader/Makefile.kmk (modified) (1 diff)
• VBoxTray/Makefile.kmk (modified) (1 diff)
• i8042prt/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk

@@ -43 +43 @@
 
  # The icon location is configurable.
- VBoxWindowsAdditions.rc_INCS += $(PATH_VBoxWindowsAdditions)
- VBoxWindowsAdditions.rc_DEPS += $(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc
- VBoxWindowsAdditions.rc_CLEAN = $(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc
+ VBoxWindowsAdditions.rc_INCS += $(VBoxWindowsAdditions_0_OUTDIR)
+ VBoxWindowsAdditions.rc_DEPS += $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
+ VBoxWindowsAdditions.rc_CLEAN = $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
 
 
  # Icon include file.
-$$(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
+$$(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
         $(RM) -f $@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -66 +66 @@
 
 # The icon location is configurable.
-VBoxTray.rc_INCS = $(PATH_VBoxTray)
-VBoxTray.rc_DEPS = $(PATH_VBoxTray)/VBoxTray-icon.rc
-VBoxTray.rc_CLEAN = $(PATH_VBoxTray)/VBoxTray-icon.rc
+VBoxTray.rc_INCS = $(VBoxTray_0_OUTDIR)
+VBoxTray.rc_DEPS = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
+VBoxTray.rc_CLEAN = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
 
 # Icon include file.
-$$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
+$$(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
         $(RM) -f $@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'

trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk

@@ -24 +24 @@
 VBoxMouseNT_DEFS        = LOG_TO_BACKDOOR
 VBoxMouseNT_INCS        = \
-        $(PATH_VBoxMouseNT) \
+        $(VBoxMouseNT_0_OUTDIR) \
         ./include \
         ./i386
@@ -44 +44 @@
         $(VBOX_LIB_IPRT_GUEST_R0_NT4)
 VBoxMouseNT_DEPS        = \
-        $(PATH_VBoxMouseNT)/i8042log.rc
+        $(VBoxMouseNT_0_OUTDIR)/i8042log.rc
 VBoxMouseNT_CLEAN       = \
-        $(PATH_VBoxMouseNT)/i8042log.dbg \
-        $(PATH_VBoxMouseNT)/i8042log.h \
-        $(PATH_VBoxMouseNT)/i8042log.rc \
-        $(PATH_VBoxMouseNT)/MSG00001.bin
+        $(VBoxMouseNT_0_OUTDIR)/i8042log.dbg \
+        $(VBoxMouseNT_0_OUTDIR)/i8042log.h \
+        $(VBoxMouseNT_0_OUTDIR)/i8042log.rc \
+        $(VBoxMouseNT_0_OUTDIR)/MSG00001.bin
 
-$$(PATH_VBoxMouseNT)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
+$$(VBoxMouseNT_0_OUTDIR)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
         $(call MSG_COMPILE,VBoxMouseNT,$<,$@,RC)
         $(QUIET)$(WIN32_MC) \
-                -r $(PATH_VBoxMouseNT)/ \
-                -x $(PATH_VBoxMouseNT)/ \
-                -h $(PATH_VBoxMouseNT)/ \
+                -r $(VBoxMouseNT_0_OUTDIR)/ \
+                -x $(VBoxMouseNT_0_OUTDIR)/ \
+                -h $(VBoxMouseNT_0_OUTDIR)/ \
                 $(subst /,\\,$<)
 endif # x86