Changeset 35380 in vbox for trunk/src/VBox/Frontends

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/Frontends

Files:

• VBoxBFE/Makefile.kmk (modified) (2 diffs)
• VBoxSDL/Makefile.kmk (modified) (3 diffs)
• VirtualBox/Makefile.kmk (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

@@ -115 +115 @@
 
 VBoxBFE_INCS = \
-        $(PATH_VBoxBFE) \
+        $(VBoxBFE_0_OUTDIR) \
         $(VBOX_PATH_SDK)/include \
         $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE
@@ -158 +158 @@
         -fno-rtti -fno-exceptions -fshort-wchar -pthread
 
-VBoxBFE_CLEAN = $(PATH_VBoxBFE)/Ico64x01.h
-VBoxBFE_SDLConsole.cpp_DEPS = $(PATH_VBoxBFE)/Ico64x01.h
+VBoxBFE_CLEAN = $(VBoxBFE_0_OUTDIR)/Ico64x01.h
+VBoxBFE_SDLConsole.cpp_DEPS = $(VBoxBFE_0_OUTDIR)/Ico64x01.h
 
 # Convert the pnm-file to a byte array.
-$$(PATH_VBoxBFE)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
+$$(VBoxBFE_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
         $(call MSG_TOOL,bin2c,VBoxBFE,$<,$@)
         $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@

trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

@@ -74 +74 @@
 
 VBoxSDL_INCS = \
-        $(PATH_VBoxSDL)
+        $(VBoxSDL_0_OUTDIR)
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
 VBoxSDL_INCS += \
@@ -99 +99 @@
         -framework Foundation -framework AppKit
 
-VBoxSDL_CLEAN = $(PATH_VBoxSDL)/Ico64x01.h
-VBoxSDL_INTERMEDIATES = $(PATH_VBoxSDL)/Ico64x01.h
+VBoxSDL_CLEAN = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
+VBoxSDL_INTERMEDIATES = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
 
 
 # Convert the pnm-file to a byte array.
-$$(PATH_VBoxSDL)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
+$$(VBoxSDL_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
         $(call MSG_TOOL,bin2c,VBoxSDL,$<,$@)
         $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
 
 # Icon include file.
-$$(PATH_VBoxSDL)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_PATH)/Makefile.kmk | $$(dir $$@)
+$$(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_PATH)/Makefile.kmk | $$(dir $$@)
         $(RM) -f $@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
@@ -130 +130 @@
 tstSDL_DEFS.linux = VBOX_OPENGL
 endif
-tstSDL_INCS = \
-        $(PATH_tstSDL)
 
 tstSDL_LIBS = \

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -194 +194 @@
 VirtualBox_INCS = \
         $(VBOX_GUI_INC_DIRS) \
-        $(PATH_VirtualBox)/include
+        $(VirtualBox_0_OUTDIR)/include
 
 # Necessary for the hdd backend enumeration
@@ -659 +659 @@
 ## @todo This needs some cleaning up perhaps...
 ## @todo kBuild: Non-existing +| targets should be tried remade or what?
-VirtualBox_BLDDIRS       += $(PATH_VirtualBox)/include
-VirtualBox_INTERMEDIATES += $(PATH_VirtualBox)/include/COMWrappers.h
+VirtualBox_BLDDIRS       += $(VirtualBox_0_OUTDIR)/include
+VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMWrappers.h
 VirtualBox_CLEAN         += \
-        $(PATH_VirtualBox)/include/COMWrappers \
-        $(PATH_VirtualBox)/include/COMWrappers.tmp \
-        $(PATH_VirtualBox)/include/COMWrappers.h \
-        $(PATH_VirtualBox)/include/COMWrappers.cpp
-VirtualBox_SOURCES       += $(PATH_VirtualBox)/include/COMWrappers.cpp
-
-$$(PATH_VirtualBox)/include/COMWrappers \
-+| $$(PATH_VirtualBox)/include/COMWrappers.h \
-+| $$(PATH_VirtualBox)/include/COMWrappers.cpp: \
+        $(VirtualBox_0_OUTDIR)/include/COMWrappers \
+        $(VirtualBox_0_OUTDIR)/include/COMWrappers.tmp \
+        $(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
+        $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
+VirtualBox_SOURCES       += $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
+
+$$(VirtualBox_0_OUTDIR)/include/COMWrappers \
++| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
++| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp: \
                 $(VBOX_XIDL_FILE) \
                 $(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl \
@@ -697 +697 @@
 
 # alias for generating the COM Wrappers file.
-testwrappers:: $$(PATH_VirtualBox)/include/COMWrappers.h
+testwrappers:: $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h
 
 
@@ -818 +818 @@
 # The IDI_ICON1 name is Qt specific.
 #
-src/platform/win/VirtualBox.rc_INCS  = $(PATH_VirtualBox)
-src/platform/win/VirtualBox.rc_DEPS  = $(PATH_VirtualBox)/VirtualBox-icon.rc
-src/platform/win/VirtualBox.rc_CLEAN = $(PATH_VirtualBox)/VirtualBox-icon.rc
-
-$$(PATH_VirtualBox)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
+src/platform/win/VirtualBox.rc_INCS  = $(VirtualBox_0_OUTDIR)
+src/platform/win/VirtualBox.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
+src/platform/win/VirtualBox.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
+
+$$(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
         $(APPEND) -t $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
@@ -847 +847 @@
 VirtualBox.app_SOURCES = \
         src/platform/darwin/PkgInfo \
-        $(PATH_VirtualBox.app)/Info.plist \
+        $(VirtualBox_0_OUTDIR.app)/Info.plist \
         $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
         $(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
@@ -855 +855 @@
         $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns
 
-$$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
+$$(VirtualBox_0_OUTDIR.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
         $(call MSG_GENERATE,VirtualBox.app,$<,$@)
         $(QUIET)$(RM) -f $@
@@ -873 +873 @@
 VirtualBoxVM.app_SOURCES = \
         src/platform/darwin/VM-PkgInfo=>PkgInfo \
-        $(PATH_VirtualBoxVM.app)/VM-Info.plist=>Info.plist
+        $(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist=>Info.plist
 VirtualBoxVM.app_SYMLINKS = \
         MacOS=>../../../MacOS/ \
         Resources=>../../../Resources/
 
-$$(PATH_VirtualBoxVM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
+$$(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
         $(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
         $(QUIET)$(RM) -f $@
@@ -902 +902 @@
 vmstarter.app_SOURCES = \
         src/platform/darwin/vmstarter-PkgInfo=>PkgInfo \
-        $(PATH_vmstarter.app)/vmstarter-Info.plist=>Info.plist
+        $(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist=>Info.plist
 vmstarter.app_SYMLINKS = \
     MacOS=>../../../MacOS \
     Resources=>../../../Resources
 
-$$(PATH_vmstarter.app)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
+$$(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
         $(call MSG_GENERATE,vmstarter.app,$<,$@)
         $(QUIET)$(RM) -f $@