Index: /trunk/Makefile.kmk
===================================================================
--- /trunk/Makefile.kmk	(revision 42275)
+++ /trunk/Makefile.kmk	(revision 42276)
@@ -22,8 +22,11 @@
 # Sub-makefiles / Sub-directories.
 #
-if defined(VBOX_WITH_DOCS) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_TESTSUITE)
+if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
  include $(PATH_SUB_CURRENT)/doc/manual/Makefile.kmk
 endif
 include $(PATH_SUB_CURRENT)/src/Makefile.kmk
+
+
+## @todo split up this file!
 
 
@@ -46,32 +49,29 @@
  && !defined(VBOX_ONLY_DOCS) \
  && !defined(VBOX_ONLY_EXTPACKS) \
- && !defined(VBOX_ONLY_TESTSUITE) # -> line 418b ;-)
-
-ifndef VBOX_OSE
- #
- # Install the license (and misc non-executable stuff).
- #
- INSTALLS += nobin
- nobin_INST = $(INST_BIN)
- nobin_MODE = 0644
- nobin_SOURCES =
- ifdef VBOX_LICENSE_FILES
-  nobin_SOURCES += \
+ && !defined(VBOX_ONLY_TESTSUITE) # -> line 426b ;-)
+
+ if !defined(VBOX_OSE) && defined(VBOX_LICENSE_FILES)
+  #
+  # Install the license (and misc non-executable stuff).
+  #
+  INSTALLS += InstallLicenseFiles
+  InstallLicenseFiles_INST = $(INST_BIN)
+  InstallLicenseFiles_MODE = 0644
+  InstallLicenseFiles_SOURCES =
+  InstallLicenseFiles_SOURCES += \
   	$(VBOX_BRAND_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER).html \
-	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(VBOX_BRAND_$(f)_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER)-$(f).html)
- endif
-endif # !OSE
+ 	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(VBOX_BRAND_$(f)_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER)-$(f).html)
+ endif
 
 
 #
 # Install external binaries (mostly redistributable parts of tools we use).
-# This must be done *before* we build the manual.
 #
 # To avoid dragging in unnecessary tools and sdks here, we don't use the .win
 # and .linux property suffixes.
 #
-INSTALLS += bin
-
-bin_INST = $(INST_BIN)
+INSTALLS += InstallExternalLibs
+
+InstallExternalLibs_INST = $(INST_BIN)
 
 # The SDL DLLs
@@ -79,12 +79,12 @@
  ifneq ($(VBOX_WITH_VBOXSDL)$(VBOX_WITH_VBOXBFE),)
   include $(KBUILD_PATH)/sdks/LIBSDL.kmk
-  bin_SOURCES += \
+  InstallExternalLibs_SOURCES += \
 	$(DLL_SDK_LIBSDL_SDL)
   ifdef VBOX_WITH_SECURELABEL
-   bin_SOURCES += \
+   InstallExternalLibs_SOURCES += \
 	$(DLL_SDK_LIBSDL_SDLTTF)
   endif
   ifeq ($(KBUILD_TARGET),os2)
-   bin_SOURCES += \
+   InstallExternalLibs_SOURCES += \
 	$(DLL_SDK_LIBSDL_FSLIB)
   endif
@@ -99,5 +99,5 @@
    VBOX_PATH_VCC_REDIST_CRT     = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT
    VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT
-   bin_SOURCES += \
+   InstallExternalLibs_SOURCES += \
    	$(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll \
    	$(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll \
@@ -114,5 +114,5 @@
   include $(KBUILD_PATH)/tools/VCC80X86.kmk
   include $(KBUILD_PATH)/tools/VCC80AMD64.kmk
-  bin_SOURCES.x86 += \
+  InstallExternalLibs_SOURCES.x86 += \
   	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
   	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
@@ -121,5 +121,5 @@
   	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
   	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
-  bin_SOURCES.amd64 += \
+  InstallExternalLibs_SOURCES.amd64 += \
   	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
   	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
@@ -129,5 +129,5 @@
   	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
   ifeq ($(VBOX_VCC_CRT_TYPE),d)
-   bin_SOURCES.x86 += \
+   InstallExternalLibs_SOURCES.x86 += \
    	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
    	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
@@ -136,5 +136,5 @@
    	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
    	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
-   bin_SOURCES.amd64 += \
+   InstallExternalLibs_SOURCES.amd64 += \
    	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
    	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
@@ -159,5 +159,5 @@
   DLL_TOOL_VCC70_MSVCR71 ?= $(PATH_TOOL_VCC70)/bin/msvcr71.dll
   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71)),)
-   bin_SOURCES += \
+   InstallExternalLibs_SOURCES += \
    	$(DLL_TOOL_VCC70_MSVCR71)=>msvcr71.dll \
    	$(DLL_TOOL_VCC70_MSVCR71)=>testcase/msvcr71.dll
@@ -166,5 +166,5 @@
    DLL_TOOL_VCC70_MSVCR71D ?= $(PATH_TOOL_VCC70)/bin/msvcr71d.dll
    ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71D)),)
-    bin_SOURCES += \
+    InstallExternalLibs_SOURCES += \
     	$(DLL_TOOL_VCC70_MSVCR71D)=>msvcr71d.dll \
     	$(DLL_TOOL_VCC70_MSVCR71D)=>testcase/msvcr71d.dll
@@ -174,5 +174,5 @@
   DLL_TOOL_VCC70_MSVCP71 ?= $(PATH_TOOL_VCC70)/bin/msvcp71.dll
   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71)),)
-   bin_SOURCES += \
+   InstallExternalLibs_SOURCES += \
 	$(DLL_TOOL_VCC70_MSVCP71)=>msvcp71.dll \
 	$(DLL_TOOL_VCC70_MSVCP71)=>testcase/msvcp71.dll
@@ -181,5 +181,5 @@
    DLL_TOOL_VCC70_MSVCP71D ?= $(PATH_TOOL_VCC70)/bin/msvcp71d.dll
    ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71D)),)
-    bin_SOURCES += \
+    InstallExternalLibs_SOURCES += \
  	$(DLL_TOOL_VCC70_MSVCP71D)=>msvcp71d.dll \
  	$(DLL_TOOL_VCC70_MSVCP71D)=>testcase/msvcp71d.dll
@@ -189,5 +189,5 @@
   DLL_TOOL_VCC70_MSVCRT  ?= $(PATH_TOOL_VCC70)/bin/msvcrt.dll
   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCRT)),)
-   bin_SOURCES += \
+   InstallExternalLibs_SOURCES += \
 	$(DLL_TOOL_VCC70_MSVCRT)=>msvcrt.dll \
 	$(DLL_TOOL_VCC70_MSVCRT)=>testcase/msvcrt.dll