Index: /trunk/src/VBox/Additions/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../..
-else
-SUB_DEPTH = .
-DEPTH     = ../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -111,15 +106,15 @@
 	32Bit/OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \
 	32Bit/OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \
-	32Bit/OS2/libc063.dll=./os2/Bin/libc063.dll \
-	32Bit/OS2/readme.txt=./os2/Bin/readme.txt \
+	32Bit/OS2/libc063.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/libc063.dll \
+	32Bit/OS2/readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/readme.txt \
 	32Bit/OS2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys
 else ifdef VBOX_WITH_OS2_ADDITIONS_BIN
  GUESTADDITIONS_FILESPEC.os2.x86 = \
-	32Bit/OS2/VBoxGuest.sys=./os2/Bin/VBoxGuest.sys \
-	32Bit/OS2/VBoxService.exe=./os2/Bin/VBoxService.exe \
-	32Bit/OS2/gengradd.dll=./os2/Bin/gengradd.dll \
-	32Bit/OS2/libc063.dll=./os2/Bin/libc063.dll \
-	32Bit/OS2/readme.txt=./os2/Bin/readme.txt \
-	32Bit/OS2/vboxmouse.sys=./os2/Bin/vboxmouse.sys
+	32Bit/OS2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/VBoxGuest.sys \
+	32Bit/OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/VBoxService.exe \
+	32Bit/OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/gengradd.dll \
+	32Bit/OS2/libc063.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/libc063.dll \
+	32Bit/OS2/readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/readme.txt \
+	32Bit/OS2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/vboxmouse.sys
 endif
 
@@ -263,3 +258,2 @@
 endif
 
-
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../..
-else
-SUB_DEPTH = ../../..
-DEPTH    ?= ../../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../../..
-else
-SUB_DEPTH = ../../../..
-DEPTH    ?= ../../../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -46,5 +41,4 @@
 	$(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)
 
-
 include	$(KBUILD_PATH)/subfooter.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../..
-else
-SUB_DEPTH = ../../..
-DEPTH    ?= ../../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../../..
-else
-SUB_DEPTH = ../../../..
-DEPTH    ?= ../../../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -43,5 +38,5 @@
 	$(VBOX_LIB_IPRT_GUEST_R0)
 
-$(error Fix inf editing and dirver signing)
+$(error Fix inf editing and driver signing)
 
 include	$(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../..
-else
-SUB_DEPTH = ../../..
-DEPTH    ?= ../../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../../..
-else
-SUB_DEPTH = ../../../..
-DEPTH    ?= ../../../../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/Makefile.kmk	(revision 12446)
@@ -19,10 +19,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -57,4 +52,6 @@
 #
 SYSMODS.x86 += VBoxGuestNT
+$(warning Try out VBoxGuestNT_EXTENDS again!)
+## @todo check this out!!!
 ifeq (kBuild,0.1.4) # This doesn't work because of the VBoxGuest_NOINST stuff above. ## @todo kBuild: change the NOINST test from ifdef to ifneq ($(strip $($(target)_NOINST)),)
 VBoxGuestNT_EXTENDS   = VBoxGuest
Index: /trunk/src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../..
-else
-SUB_DEPTH = ../../..
-DEPTH    ?= ../../../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk	(revision 12446)
@@ -11,10 +11,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -55,12 +50,15 @@
 VBoxService.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
 VBoxService.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+
+# The icon is configurable.
 VBoxService.rc_INCS = $(PATH_VBoxService)
 VBoxService.rc_DEPS = $(PATH_VBoxService)/VBoxService-icon.rc
 VBoxService.rc_CLEAN = $(PATH_VBoxService)/VBoxService-icon.rc
 
+# Icon include file.
+$$(PATH_VBoxService)/VBoxService-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxService_PATH)/Makefile.kmk | $$(dir $$@)
+	$(RM) -f $@
+	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
+
 include	$(KBUILD_PATH)/subfooter.kmk
 
-# Icon include file.
-$(PATH_VBoxService)/VBoxService-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(VBoxService_PATH)/Makefile.kmk | $$(call DIRDEP,$$(@D))
-	$(RM) -f $@
-	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -59,9 +54,9 @@
 VBoxTray.rc_CLEAN = $(PATH_VBoxTray)/VBoxTray-icon.rc
 
-include	$(KBUILD_PATH)/subfooter.kmk
-
 # Icon include file.
-$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(VBoxTray_PATH)/Makefile.kmk | $$(call DIRDEP,$$(@D))
+$$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
 	$(RM) -f $@
 	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
+include	$(KBUILD_PATH)/subfooter.kmk
+
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/testcase/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/testcase/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../../..
-else
-SUB_DEPTH = ../../..
-DEPTH    ?= ../../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -60,8 +55,5 @@
 	$(PATH_VBoxMouseNT)/MSG00001.bin
 
-
-include	$(KBUILD_PATH)/subfooter.kmk
-
-$(PATH_VBoxMouseNT)/i8042log.rc: $(VBoxMouseNT_PATH)/i8042log.mc | $(call DIRDEP,$(PATH_VBoxMouseNT))
+$$(PATH_VBoxMouseNT)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
 	$(call MSG_COMPILE,VBoxMouseNT,$<,$@,RC)
 	$(QUIET)$(WIN32_MC) \
@@ -71,2 +63,5 @@
 		$(subst /,\\,$<)
 
+
+include	$(KBUILD_PATH)/subfooter.kmk
+
Index: /trunk/src/VBox/Additions/common/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/common/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-DEPTH    ?= ../../../..
-SUB_DEPTH = ..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -32,6 +27,6 @@
 include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
 if1of ($(KBUILD_TARGET), freebsd os2 solaris)
-include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
-include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
 endif
 
Index: /trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-SUB_DEPTH = ../..
-DEPTH    ?= ../../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk	(revision 12446)
@@ -20,6 +20,5 @@
 #
 
-DEPTH ?= ../../../../..
-SUB_DEPTH = ../..
+SUB_DEPTH = ../../../../..
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -36,5 +35,5 @@
  VBoxGuest_TEMPLATE      = VBOXGUESTR0
  VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
- VBoxGuest_INCS         := $(PATH_SUB_CURRENT)
+ VBoxGuest_INCS          = .
  ifneq ($(KBUILD_TARGET),os2)
   VBoxGuest_SOURCES    = \
@@ -63,7 +62,6 @@
   VBoxGuestLibOs2Hack_NOINST     = 1
   VBoxGuestLibOs2Hack_DEFS       = $(VBoxGuest_DEFS)
-  VBoxGuestLibOs2Hack_INCS      := \
-  	$(PATH_SUB_CURRENT) \
-  	$(PATH_TARGET) \
+  VBoxGuestLibOs2Hack_INCS       = \
+  	. \
   	$(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
   VBoxGuestLibOs2Hack_SOURCES    = \
@@ -80,8 +78,8 @@
  vboxguest_TEMPLATE      = VBOXGUESTR0
  vboxguest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
- vboxguest_INCS         := \
-	$(PATH_SUB_CURRENT)
+ vboxguest_INCS          = \
+	.
  vboxguest_INCS.freebsd  = \
-	$(PATH_TARGET)
+	$(PATH_vboxguest)
  vboxguest_SOURCES       = \
  	VBoxGuest-$(KBUILD_TARGET).c \
@@ -91,7 +89,7 @@
  	$(VBOX_LIB_IPRT_GUEST_R0)
  vboxguest_DEPS.freebsd  = \
-	$(PATH_TARGET)/pci_if.h \
-	$(PATH_TARGET)/bus_if.h \
-	$(PATH_TARGET)/device_if.h
+	$(PATH_vboxguest)/pci_if.h \
+	$(PATH_vboxguest)/bus_if.h \
+	$(PATH_vboxguest)/device_if.h
  vboxguest_CLEAN.freebsd = $(vboxguest_DEPS.freebsd)
 
@@ -104,21 +102,21 @@
  #
  VBOX_AWK := /usr/bin/awk
- $(PATH_TARGET)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m
+ $$(PATH_vboxguest)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
-	$(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_TARGET)/bus_if.m
-	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_TARGET)/bus_if.m -h -p
-	$(QUIET)$(RM) $(PATH_TARGET)/bus_if.m
+	$(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_vboxguest)/bus_if.m
+	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/bus_if.m -h -p
+	$(QUIET)$(RM) $(PATH_vboxguest)/bus_if.m
 
- $(PATH_TARGET)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m
+ $$(PATH_vboxguest)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
-	$(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_TARGET)/device_if.m
-	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_TARGET)/device_if.m -h -p
-	$(QUIET)$(RM) $(PATH_TARGET)/device_if.m
+	$(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_vboxguest)/device_if.m
+	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/device_if.m -h -p
+	$(QUIET)$(RM) $(PATH_vboxguest)/device_if.m
 
- $(PATH_TARGET)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m
+ $$(PATH_vboxguest)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
-	$(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m $(PATH_TARGET)/pci_if.m
-	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_TARGET)/pci_if.m -h -p
-	$(QUIET)$(RM) $(PATH_TARGET)/pci_if.m
+	$(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m $(PATH_vboxguest)/pci_if.m
+	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/pci_if.m -h -p
+	$(QUIET)$(RM) $(PATH_vboxguest)/pci_if.m
 
 endif
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -103,5 +98,5 @@
 	VBoxGuestR3LibGR.cpp \
 	$(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
-	VBoxGuestR3LibMisc.cpp	
+	VBoxGuestR3LibMisc.cpp
 endif
 
Index: /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk	(revision 12446)
@@ -20,17 +20,8 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
-ifeq ($(KBUILD_HOST),os2)
- ifdef VBOX_WITH_OS2_ADDITIONS
-  PROGRAMS += VBoxService
- endif
-else
+if "$(KBUILD_HOST)" != "os2" || defined(VBOX_WITH_OS2_ADDITIONS)
  PROGRAMS += VBoxService
 endif
@@ -56,4 +47,5 @@
 VBoxService_LIBPATH.freebsd = \
 	/usr/local/lib
+
 include	$(KBUILD_PATH)/subfooter.kmk
 
Index: /trunk/src/VBox/Additions/freebsd/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/freebsd/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/freebsd/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -32,21 +27,26 @@
 endif
 
+# Include sub-makefiles.
 include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk
 
-PKGFILENAME    := VBoxFreeBSDAdditions.tbz
-PKGINFO_ARCH    = $(shell uname -p)
+# Globals
+VBOX_FBSD_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/FreeBSD/Installer
+BLDDIRS                   += $(VBOX_FBSD_ADD_INS_OUT_DIR)
+
+VBOX_FBSD_ADD_PKG_FILENAME := VBoxFreeBSDAdditions.tbz
+VBOX_FBSD_ADD_PKGINFO_ARCH    = $(shell uname -p)
 VBOX_PATH_FREEBSD_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/Installer
 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer
-FREEBSDINSTDIR := $(PATH_TARGET)/install
 
 ifeq ($(KBUILD_TYPE),debug)
- BIN_COPY         := $(CP) -f
- BIN_COPY_SYMBOLS := $(CP) -f
+ VBOX_FBSD_ADD_BIN_COPY         := $(CP) -f
+ VBOX_FBSD_ADD_BIN_COPY_SYMBOLS := $(CP) -f
 else
- BIN_COPY         := objcopy -S -R .comment
- BIN_COPY_SYMBOLS := objcopy -g -R .comment
+ VBOX_FBSD_ADD_BIN_COPY         := objcopy -S -R .comment
+ VBOX_FBSD_ADD_BIN_COPY_SYMBOLS := objcopy -g -R .comment
 endif
 
-PACKING     += $(PATH_BIN)/additions/$(PKGFILENAME)
+# Targets.
+PACKING     += $(PATH_BIN)/additions/$(VBOX_FBSD_ADD_PKG_FILENAME)
 OTHER_CLEAN += $(PACKING)
 
@@ -73,23 +73,23 @@
 	$(call MSG_L1,Installing guest additions)
 	@# Clear out the existing package files if needed
-	$(QUIET)rm -rf $(FREEBSDINSTDIR)
-	$(QUIET)$(MKDIR) -p $(FREEBSDINSTDIR)
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/vboxguest.sh                     $(FREEBSDINSTDIR)/vboxguest.sh
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(FREEBSDINSTDIR)/1099.vboxclient
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl                         $(FREEBSDINSTDIR)/x11config.pl
-	$(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest.ko                                                 $(FREEBSDINSTDIR)/vboxguest.ko
-	$(QUIET)$(if $(VBOX_DO_STRIP),strip $(FREEBSDINSTDIR)/vboxguest.ko,)
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxClient                                                $(FREEBSDINSTDIR)/VBoxClient
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxService                                               $(FREEBSDINSTDIR)/VBoxService
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxControl                                               $(FREEBSDINSTDIR)/VBoxControl
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_13.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_14.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_70.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so                                       $(FREEBSDINSTDIR)/vboxvideo_drv_71.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so                                       $(FREEBSDINSTDIR)/vboxmouse_drv_14.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so                                       $(FREEBSDINSTDIR)/vboxmouse_drv_70.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so                                       $(FREEBSDINSTDIR)/vboxmouse_drv_71.so
+	$(QUIET)$(RM) -Rf -- $(VBOX_FBSD_ADD_INS_OUT_DIR)
+	$(QUIET)$(MKDIR) -p $(VBOX_FBSD_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_FREEBSD_ADDITION_INSTALLER)/vboxguest.sh         $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.sh
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient        $(VBOX_FBSD_ADD_INS_OUT_DIR)/1099.vboxclient
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl             $(VBOX_FBSD_ADD_INS_OUT_DIR)/x11config.pl
+	$(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest.ko                                     $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.ko
+	$(QUIET)$(if $(VBOX_DO_STRIP),strip $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxguest.ko,)
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient                      $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxClient
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxService                     $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxService
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl                     $(VBOX_FBSD_ADD_INS_OUT_DIR)/VBoxControl
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_13.so
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxvideo_drv_71.so
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so
+	$(QUIET)$(VBOX_FBSD_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so             $(VBOX_FBSD_ADD_INS_OUT_DIR)/vboxmouse_drv_71.so
 	$(call MSG_L1,Creating install package: $@)
-	$(QUIET)$(VBOX_MAKESELF) $(FREEBSDINSTDIR) $@ \
+	$(QUIET)$(VBOX_MAKESELF) $(VBOX_FBSD_ADD_INS_OUT_DIR) $@ \
 		"VirtualBox $(VBOX_VERSION_STRING) Guest Additions for FreeBSD installation" /bin/sh ./install.sh " 1> /dev/null 2> /dev/null"
 
Index: /trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -38,7 +33,7 @@
 vboxvfs_TEMPLATE      = VBOXGUESTR0
 vboxvfs_DEFS          = VBOX_WITH_HGCM
-vboxvfs_INCS         := \
-       $(PATH_SUB_CURRENT) \
-       $(PATH_TARGET)
+vboxvfs_INCS          = \
+        . \
+       $(PATH_vboxfs)
 vboxvfs_SOURCES       = \
 	vboxvfs_vfsops.c \
@@ -48,25 +43,25 @@
 	$(VBOX_LIB_IPRT_GUEST_R0)
 vboxvfs_DEPS          = \
-       $(PATH_TARGET)/vnode_if.h \
-       $(PATH_TARGET)/vnode_if_newproto.h \
-       $(PATH_TARGET)/vnode_if_typedef.h
+       $$(PATH_vboxvfs)/vnode_if.h \
+       $$(PATH_vboxvfs)/vnode_if_newproto.h \
+       $$(PATH_vboxvfs)/vnode_if_typedef.h
 vboxvfs_CLEAN        += $(vboxvfs_DEPS)
 
 VBOX_AWK := /usr/bin/awk
 
-$(PATH_TARGET)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
+$$(PATH_vboxvfs)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
 	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -h
-	$(QUIET)$(MV) $(PATH_SUB_CURRENT)/vnode_if.h $(PATH_TARGET)/vnode_if.h
+	$(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if.h $(PATH_vboxvfs)/vnode_if.h
 
-$(PATH_TARGET)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
+$$(PATH_vboxvfs)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
 	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -p
-	$(QUIET)$(MV) $(PATH_SUB_CURRENT)/vnode_if_newproto.h $(PATH_TARGET)/vnode_if_newproto.h
+	$(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_newproto.h $(PATH_vboxvfs)/vnode_if_newproto.h
 
-$(PATH_TARGET)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
+$$(PATH_vboxvfs)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
 	$(call MSG_TOOL,awk,VBoxGuest,$<,$@)
 	$(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -q
-	$(QUIET)$(MV) $(PATH_SUB_CURRENT)/vnode_if_typedef.h $(PATH_TARGET)/vnode_if_typedef.h
+	$(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_typedef.h $(PATH_vboxvfs)/vnode_if_typedef.h
 
 include	$(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/Additions/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 12446)
@@ -20,16 +20,17 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
+#
+# Include sub-makefiles.
+#
 include $(PATH_SUB_CURRENT)/module/Makefile.kmk
 include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk
 include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk
 
+#
+# Targets
+#
 ifndef VBOX_OSE
  PACKING     += $(PATH_BIN)/additions/VBoxLinuxAdditions.run
@@ -39,16 +40,22 @@
 endif
 
+#
+# Globals
+#
+VBOX_LNX_ADD_INS_OUT_DIR           := $(PATH_TARGET)/Additions/Installer/linux
+BLDDIRS                            += $(VBOX_LNX_ADD_INS_OUT_DIR)
 VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer
 VBOX_PATH_X11_ADDITION_INSTALLER   := $(PATH_ROOT)/src/VBox/Additions/x11/installer
 
+ifeq ($(KBUILD_TYPE),debug)
+ VBOX_LNX_ADD_BIN_COPY              = $(CP) -f
+ VBOX_LNX_ADD_BIN_COPY_SYMBOLS      = $(CP) -f
+else
+ VBOX_LNX_ADD_BIN_COPY              = objcopy -S -R .comment
+ VBOX_LNX_ADD_BIN_COPY_SYMBOLS      = objcopy -g -R .comment
+endif
+
 include	$(KBUILD_PATH)/subfooter.kmk
 
-ifeq ($(KBUILD_TYPE),debug)
- BIN_COPY         = $(CP) -f
- BIN_COPY_SYMBOLS = $(CP) -f
-else
- BIN_COPY         = objcopy -S -R .comment
- BIN_COPY_SYMBOLS = objcopy -g -R .comment
-endif
 
 #
@@ -99,15 +106,15 @@
 		$(VBOX_VERSION_STAMP)
 	$(call MSG_L1,Creating $@)
-	$(QUIET)$(MKDIR) -p $(PATH_TARGET)/install
+	$(QUIET)$(MKDIR) -p $(VBOX_LNX_ADD_INS_OUT_DIR)
 # Remove target directory first, otherwise the behaviour of cp will not be
 # what we want if it already exists. See the cp manual page for more details.
-	$(QUIET)rm -rf $(PATH_TARGET)/install/module
-	$(QUIET)cp -af $(PATH_BIN)/additions/src $(PATH_TARGET)/install/module
-	$(QUIET)$(MKDIR) -p $(PATH_TARGET)/install/module/test
-	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test  $(PATH_TARGET)/install/module/test/Makefile
-	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c         $(PATH_TARGET)/install/module/test/
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync           $(PATH_TARGET)/install/vboxadd-timesync
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxClient                 $(PATH_TARGET)/install/VBoxClient
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxControl                $(PATH_TARGET)/install/VBoxControl
+	$(QUIET)$(RM) -Rf -- $(VBOX_LNX_ADD_INS_OUT_DIR)/module
+	$(QUIET)cp -af $(PATH_BIN)/additions/src $(VBOX_LNX_ADD_INS_OUT_DIR)/module
+	$(QUIET)$(MKDIR) -p $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test
+	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test  $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test/Makefile
+	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c         $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test/
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxadd-timesync
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient                 $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxClient
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl                $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxControl
 	$(QUIET)$(SED) \
 	    -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
@@ -116,34 +123,35 @@
 	    -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
 	    -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
-	    < $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh > $(PATH_TARGET)/install/install_.sh
-	$(QUIET)$(INSTALL) -m 0755 $(PATH_TARGET)/install/install_.sh $(PATH_TARGET)/install/install.sh
-	$(QUIET)$(RM) $(PATH_TARGET)/install/install_.sh
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh          $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient     $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop    $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh          $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh         $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids         $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl          $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl        $(PATH_TARGET)/install
-	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi    $(PATH_TARGET)/install
-	$(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o        $(PATH_TARGET)/install/vboxmouse_drv.o
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so    $(PATH_TARGET)/install/vboxmouse_drv_70.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so    $(PATH_TARGET)/install/vboxmouse_drv_71.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so    $(PATH_TARGET)/install/vboxmouse_drv_14.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so    $(PATH_TARGET)/install/vboxmouse_drv_15.so
-	$(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o        $(PATH_TARGET)/install/vboxvideo_drv.o
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so    $(PATH_TARGET)/install/vboxvideo_drv_70.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so    $(PATH_TARGET)/install/vboxvideo_drv_71.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so    $(PATH_TARGET)/install/vboxvideo_drv_13.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so    $(PATH_TARGET)/install/vboxvideo_drv_14.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so    $(PATH_TARGET)/install/vboxvideo_drv_15.so
-	$(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/mountvboxsf            $(PATH_TARGET)/install/mount.vboxsf
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_TARGET)/install
+	    --output $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh \
+	    $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh $(VBOX_LNX_ADD_INS_OUT_DIR)/install.sh
+	$(QUIET)$(RM) $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient     $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop    $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh         $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids         $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl          $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl        $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi    $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o       $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv.o
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_71.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_15.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o       $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv.o
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_71.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_13.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_15.so
+	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/mountvboxsf                   $(VBOX_LNX_ADD_INS_OUT_DIR)/mount.vboxsf
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
 ifdef VBOX_SELINUX_CMPLD
-	$(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD)                            $(PATH_TARGET)/install
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD)                                     $(VBOX_LNX_ADD_INS_OUT_DIR)
 endif
-	$(QUIET)$(VBOX_MAKESELF) $(PATH_TARGET)/install $@ \
+	$(QUIET)$(VBOX_MAKESELF) $(VBOX_LNX_ADD_INS_OUT_DIR) $@ \
 		"VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux installation" /bin/sh ./install.sh "> /dev/null"
 
Index: /trunk/src/VBox/Additions/linux/daemon/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/daemon/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/linux/daemon/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/linux/module/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/module/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/linux/module/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk	(revision 12446)
@@ -4,6 +4,6 @@
 #
 
-DEPTH = ../../../../..
-include	$(KBUILD_PATH)/header.kmk
+SUB_DEPTH = ../../../../..
+include	$(KBUILD_PATH)/subheader.kmk
 
 #?DLLS += VBoxSF
@@ -14,5 +14,5 @@
 VBoxSF_DEFS          = VBOX_WITH_HGCM
 VBoxSF_INCS         := \
-	$(PATH_SUB_CURRENT) \
+	. \
 	$(PATH_ROOT)/src/VBox/Runtime/include
 VBoxSF_LDFLAGS      := $(addprefix -Zlinker , \
@@ -33,4 +33,4 @@
 	end
 
-include	$(KBUILD_PATH)/footer.kmk
+include	$(KBUILD_PATH)/subfooter.kmk
 
Index: /trunk/src/VBox/Additions/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/solaris/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -39,6 +34,5 @@
 vboxvfs_DEFS          = VBOX_WITH_HGCM
 vboxvfs_INCS         := \
-       $(PATH_SUB_CURRENT) \
-       $(PATH_TARGET)
+	.
 vboxvfs_SOURCES       = \
 	vboxvfs_vfsops.c \
Index: /trunk/src/VBox/Additions/x11/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/x11/Makefile.kmk	(revision 12446)
@@ -19,10 +19,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/x11/xclient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/xclient/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/x11/xclient/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
@@ -75,8 +70,8 @@
 # Actually, this is darn annoying and will *NOT* be tolerated for any new code!
 #
-VBoxClient_LIBPATH  += $(PATH_TARGET)/VBoxClient
-VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a
-VBoxClient_CLEAN     = $(PATH_TARGET)/VBoxClient/libstdc++.a
-$(PATH_TARGET)/VBoxClient/libstdc++.a:
+VBoxClient_LIBPATH  += $(PATH_VBoxClient)
+VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
+VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
+$$(PATH_VBoxClient)/libstdc++.a:
 	$(call MSG_L1,Forcing static libstdc++)
 	$(QUIET)$(MKDIR) -p $(@D)
Index: /trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
Index: /trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk	(revision 12445)
+++ /trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk	(revision 12446)
@@ -20,10 +20,5 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include	$(KBUILD_PATH)/subheader.kmk
 
