Index: /trunk/src/VBox/Debugger/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Debugger/Makefile.kmk	(revision 35439)
+++ /trunk/src/VBox/Debugger/Makefile.kmk	(revision 35440)
@@ -79,5 +79,5 @@
 	testcase/tstDBGCStubs.cpp
 tstDBGCParser_LIBS = \
-	$(TARGET_Debugger) \
+	$(Debugger_1_TARGET) \
 	$(LIB_RUNTIME)
 
Index: /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk	(revision 35439)
+++ /trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk	(revision 35440)
@@ -70,6 +70,6 @@
 
 # 1. create vbetables.h
-$$(VgaBiosBin_0_OUTDIR)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen) | $$(dir $$@)
-	$(QUIET)$(REDIRECT) -wo $@ -- $(TARGET_vbetables-gen)
+$$(VgaBiosBin_0_OUTDIR)/vbetables.h: $(MAKEFILE_CURRENT) $$(vbetables-gen_1_TARGET) | $$(dir $$@)
+	$(QUIET)$(REDIRECT) -wo $@ -- $(vbetables-gen_1_TARGET)
 
 # 2. precompile
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk	(revision 35439)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk	(revision 35440)
@@ -60,5 +60,5 @@
 	testcase/tstUSBFilter.cpp
 tstUSBFilter_LIBS  = \
-        $(TARGET_USBLib)
+        $(USBLib_1_TARGET)
 endif
 
Index: /trunk/src/VBox/Installer/darwin/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/darwin/Makefile.kmk	(revision 35439)
+++ /trunk/src/VBox/Installer/darwin/Makefile.kmk	(revision 35440)
@@ -189,5 +189,5 @@
 		$(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg \
 		$(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg \
-		$$(TARGET_RegistrationPane) \
+		$$(RegistrationPane_1_TARGET) \
 		$(if $(VBOX_OSE), , \
     		$(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Info.plist \
@@ -293,5 +293,5 @@
 	$(MKDIR) -p $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/
 	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Info.plist                                                     $@/Contents/Plugins/RegistrationPane.bundle/Contents/
-	$(INSTALL) -m 0644 $(TARGET_RegistrationPane)                                                                                           $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/
+	$(INSTALL) -m 0644 $(RegistrationPane_1_TARGET)                                                                                           $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/
 	$(MKDIR) -p $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/RegistrationPane.nib
 	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/InfoPlist.strings                      $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/
Index: /trunk/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 35439)
+++ /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 35440)
@@ -644,7 +644,7 @@
 + $(VBOXWEB_OUT_DIR)/soapC-19.cpp \
 + $(VBOXWEB_OUT_DIR)/soapC-20.cpp \
-: $(VBOXWEB_OUT_DIR)/soapC.cpp $$(TARGET_split-soapC) | $$(dir $$@)
+: $(VBOXWEB_OUT_DIR)/soapC.cpp $$(split-soapC_1_TARGET) | $$(dir $$@)
 	$(RM) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapC-?.cpp $(VBOXWEB_OUT_DIR)/soapC-??.cpp)
-	$(TARGET_split-soapC) $(VBOXWEB_OUT_DIR)/soapC.cpp $(VBOXWEB_OUT_DIR) 20
+	$(split-soapC_1_TARGET) $(VBOXWEB_OUT_DIR)/soapC.cpp $(VBOXWEB_OUT_DIR) 20
 endif # !VBOX_WITHOUT_SPLIT_SOAPC
 
Index: /trunk/src/libs/xpcom18a4/Config.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/Config.kmk	(revision 35439)
+++ /trunk/src/libs/xpcom18a4/Config.kmk	(revision 35440)
@@ -131,5 +131,5 @@
 TEMPLATE_XPCOM_LIBS.l4             = $(VBOX_GCC_LIBGCC)
 TEMPLATE_XPCOM_LIBS.solaris        = sendfile
-TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst))) \
+TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) \
                                      $(PATH_TARGET)/VBox-xpcom-idl-timestamp
 ifeq ($(KBUILD_TARGET),os2)
@@ -162,6 +162,6 @@
                                      .
 TEMPLATE_XPCOMEXE_LIBS             = \
-	$(TARGET_VBox-xpcom-ipcshared) \
-	$(TARGET_VBoxXPCOM) \
+	$(VBox-xpcom-ipcshared_1_TARGET) \
+	$(VBoxXPCOM_1_TARGET) \
 	$(TEMPLATE_XPCOM_LIBS)
 TEMPLATE_XPCOMEXE_LIBS.freebsd     = $(LIB_PTHREAD)
@@ -211,5 +211,5 @@
 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
 TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin     = $(TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
-TEMPLATE_XPCOMBLDPROG_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
+TEMPLATE_XPCOMBLDPROG_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
 
 
Index: /trunk/src/libs/xpcom18a4/Makefile.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 35439)
+++ /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 35440)
@@ -459,5 +459,5 @@
  # install necessary DLLs to the same place where xpidl goes
  INSTALLS += xpidl-DLLS
- xpidl_ORDERDEPS = $(TARGET_xpidl-DLLS)
+ xpidl_ORDERDEPS = $(xpidl-DLLS_1_TARGET)
  xpidl-DLLS_INST = $(xpidl_INST)
  # static libraries of these may be provided instead,
@@ -947,5 +947,5 @@
                          xpcom/glue/standalone/nsGREDirServiceProvider.cpp
 VBoxXPCOMGlue_SOURCES += \
-	$(TARGET_VBox-xpcom-string)
+	$(VBox-xpcom-string_1_TARGET)
 #VBoxXPCOMGlue_INST     = lib/ $(INST_SDK)lib/
 
@@ -973,16 +973,16 @@
 	vboxdeps.cpp
 VBoxXPCOM_LIBS = \
-	$(TARGET_VBox-xpcom-typelib) \
-	$(TARGET_VBox-xpcom-string) \
-	$(TARGET_VBox-xpcom-base) \
-	$(TARGET_VBox-xpcom-ds) \
-	$(TARGET_VBox-xpcom-io) \
-	$(TARGET_VBox-xpcom-components) \
-	$(TARGET_VBox-xpcom-threads) \
-	$(TARGET_VBox-xpcom-xptinfo) \
-	$(TARGET_VBox-xpcom-xptcall) \
-	$(TARGET_VBox-xpcom-proxy) \
-	$(TARGET_VBox-xpcom-nspr) \
-	$(TARGET_VBoxXPCOMGlue_s)
+	$(VBox-xpcom-typelib_1_TARGET) \
+	$(VBox-xpcom-string_1_TARGET) \
+	$(VBox-xpcom-base_1_TARGET) \
+	$(VBox-xpcom-ds_1_TARGET) \
+	$(VBox-xpcom-io_1_TARGET) \
+	$(VBox-xpcom-components_1_TARGET) \
+	$(VBox-xpcom-threads_1_TARGET) \
+	$(VBox-xpcom-xptinfo_1_TARGET) \
+	$(VBox-xpcom-xptcall_1_TARGET) \
+	$(VBox-xpcom-proxy_1_TARGET) \
+	$(VBox-xpcom-nspr_1_TARGET) \
+	$(VBoxXPCOMGlue_s_1_TARGET)
 VBoxXPCOM_LIBS.linux = \
 	pthread dl
@@ -990,32 +990,32 @@
 ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
 VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \
-	$(TARGET_VBox-xpcom-typelib) \
-	$(TARGET_VBox-xpcom-string) \
-	$(TARGET_VBox-xpcom-base) \
-	$(TARGET_VBox-xpcom-ds) \
-	$(TARGET_VBox-xpcom-io) \
-	$(TARGET_VBox-xpcom-components) \
-	$(TARGET_VBox-xpcom-threads) \
-	$(TARGET_VBox-xpcom-xptinfo) \
-	$(TARGET_VBox-xpcom-xptcall) \
-	$(TARGET_VBox-xpcom-proxy) \
-	$(TARGET_VBox-xpcom-nspr) \
-	$(TARGET_VBoxXPCOMGlue_s) \
+	$(VBox-xpcom-typelib_1_TARGET) \
+	$(VBox-xpcom-string_1_TARGET) \
+	$(VBox-xpcom-base_1_TARGET) \
+	$(VBox-xpcom-ds_1_TARGET) \
+	$(VBox-xpcom-io_1_TARGET) \
+	$(VBox-xpcom-components_1_TARGET) \
+	$(VBox-xpcom-threads_1_TARGET) \
+	$(VBox-xpcom-xptinfo_1_TARGET) \
+	$(VBox-xpcom-xptcall_1_TARGET) \
+	$(VBox-xpcom-proxy_1_TARGET) \
+	$(VBox-xpcom-nspr_1_TARGET) \
+	$(VBoxXPCOMGlue_s_1_TARGET) \
 	-Wl,--no-whole-archive
 endif
 
 VBoxXPCOM_LDFLAGS.solaris += -Wl,-z,allextract \
-	$(TARGET_VBox-xpcom-typelib) \
-	$(TARGET_VBox-xpcom-string) \
-	$(TARGET_VBox-xpcom-base) \
-	$(TARGET_VBox-xpcom-ds) \
-	$(TARGET_VBox-xpcom-io) \
-	$(TARGET_VBox-xpcom-components) \
-	$(TARGET_VBox-xpcom-threads) \
-	$(TARGET_VBox-xpcom-xptinfo) \
-	$(TARGET_VBox-xpcom-xptcall) \
-	$(TARGET_VBox-xpcom-proxy) \
-	$(TARGET_VBox-xpcom-nspr) \
-	$(TARGET_VBoxXPCOMGlue_s) \
+	$(VBox-xpcom-typelib_1_TARGET) \
+	$(VBox-xpcom-string_1_TARGET) \
+	$(VBox-xpcom-base_1_TARGET) \
+	$(VBox-xpcom-ds_1_TARGET) \
+	$(VBox-xpcom-io_1_TARGET) \
+	$(VBox-xpcom-components_1_TARGET) \
+	$(VBox-xpcom-threads_1_TARGET) \
+	$(VBox-xpcom-xptinfo_1_TARGET) \
+	$(VBox-xpcom-xptcall_1_TARGET) \
+	$(VBox-xpcom-proxy_1_TARGET) \
+	$(VBox-xpcom-nspr_1_TARGET) \
+	$(VBoxXPCOMGlue_s_1_TARGET) \
 	-Wl,-z,defaultextract
 
@@ -1042,5 +1042,5 @@
 endif
 
-TEMPLATE_XPCOMIPC_LIBS             = $(TARGET_VBoxXPCOM) $(TEMPLATE_XPCOM_LIBS)
+TEMPLATE_XPCOMIPC_LIBS             = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPCOM_LIBS)
 
 TEMPLATE_XPCOMIPCEXE               = XPCOM IPC executables
@@ -1107,9 +1107,9 @@
 VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxXPCOMIPCC.dylib
 VBoxXPCOMIPCC_LIBS = \
-	$(TARGET_VBox-xpcom-ipcutils) \
-	$(TARGET_VBox-xpcom-ipcshared) \
-	$(TARGET_VBox-xpcom-ipcdlock) \
-	$(TARGET_VBox-xpcom-ipctransmgr) \
-	$(TARGET_VBox-xpcom-ipctmgrcom)
+	$(VBox-xpcom-ipcutils_1_TARGET) \
+	$(VBox-xpcom-ipcshared_1_TARGET) \
+	$(VBox-xpcom-ipcdlock_1_TARGET) \
+	$(VBox-xpcom-ipctransmgr_1_TARGET) \
+	$(VBox-xpcom-ipctmgrcom_1_TARGET)
 # EF
 #VBoxXPCOMIPCC_LIBS += $(LIB_RUNTIME)
@@ -1310,8 +1310,8 @@
 
 # combined typelib library
-$(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $$(VBOX_XPTFILES) | $$(TARGET_xpt_link) $(PATH_TARGET)/VBox-xpcom-xpt-files/
+$(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $$(VBOX_XPTFILES) | $$(xpt_link_1_TARGET) $(PATH_TARGET)/VBox-xpcom-xpt-files/
 	$(call MSG_LINK,XPCOM_TYPELIB,$@)
 	$(QUIET)$(MKDIR) -p -- $(PATH_BIN)/components
-	$(QUIET)$(TARGET_xpt_link) $@ $^
+	$(QUIET)$(xpt_link_1_TARGET) $@ $^
 
 
@@ -1333,10 +1333,10 @@
 + $(PATH_TARGET)/VBox-xpcom-xpt-files/$(notdir $(subst .idl,.xpt,$(idl))): \
 		$(VBOX_PATH_XPCOM_SRC)/$(idl) \
-		| $$$$(TARGET_xpidl) \
+		| $$$$(xpidl_1_TARGET) \
 		$(PATH_TARGET)/VBox-xpcom-xpt-files/
 	$$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@)
 	$$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/xpcom/include $(VBOX_PATH_SDK)/bindings/xpcom/idl
-	$$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<
-	$$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
+	$$(QUIET)$$(xpidl_1_TARGET) -m header $(XPIDL_INCS) -e $$@ $$<
+	$$(QUIET)$$(xpidl_1_TARGET) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
 	$$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/bindings/xpcom/idl
 endef