*kmk: VBOX_ONLY_SDK_ON_WINDOWS changes and cleanups. bugref:10442

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99701 cfe28804-0f27-0410-a406-dd0f0b0b656f

4 files changed, 17 insertions, 15 deletions

diff --git a/src/Makefile.kmk b/src/Makefile.kmk
index d670398590b..323b22b1124 100644
--- a/src/Makefile.kmk
+++ b/src/Makefile.kmk
@@ -30,7 +30,9 @@ include $(KBUILD_PATH)/subheader.kmk
 
 include $(PATH_SUB_CURRENT)/bldprogs/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
-include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+if !defined(VBOX_ONLY_SDK_ON_WINDOWS) || "$(KBUILD_TARGET)" != "win"
+ include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+endif
 ifndef VBOX_ONLY_BUILD
  # Normal build.
  ifneq ($(wildcard $(PATH_SUB_CURRENT)/apps),)
diff --git a/src/VBox/Installer/Makefile.kmk b/src/VBox/Installer/Makefile.kmk
index be50f085649..98035cbdd1d 100644
--- a/src/VBox/Installer/Makefile.kmk
+++ b/src/VBox/Installer/Makefile.kmk
@@ -72,7 +72,7 @@ if defined(VBOX_ONLY_SDK) ## @todo || defined(VBOX_WITH_SDK)
  		$(PATH_STAGE_BIN)/sdk \
  		$(VBOX_VERSION_STAMP)
 	$(call MSG_L1,Making SDK delivery $@)
-	$(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 $@ sdk
+	$(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 "$@" sdk
 endif
 
 
diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk
index dc64b07fe80..ce4e91bab73 100644
--- a/src/VBox/Main/Makefile.kmk
+++ b/src/VBox/Main/Makefile.kmk
@@ -44,15 +44,15 @@ ifndef VBOX_ONLY_EXTPACKS
  endif
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
  include $(PATH_SUB_CURRENT)/cbinding/Makefile.kmk
- include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
  ifndef VBOX_ONLY_SDK
+  include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
   include $(PATH_SUB_CURRENT)/src-helper-apps/OpenGLTest/Makefile.kmk
- endif
- if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED)
-  include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk
- endif
- if defined(VBOX_WITH_DEVMAPPER) && !defined(VBOX_ONLY_SDK)
-  include $(PATH_SUB_CURRENT)/src-helper-apps/VBoxVolInfo/Makefile.kmk
+  if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED)
+   include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk
+  endif
+  ifdef VBOX_WITH_DEVMAPPER
+   include $(PATH_SUB_CURRENT)/src-helper-apps/VBoxVolInfo/Makefile.kmk
+  endif
  endif
 endif
 
@@ -220,7 +220,7 @@ VBOX_IDL_TYPELIB.XPCOM = $(PATH_STAGE_BIN)/components/VirtualBox_XPCOM.xpt
 VBOX_IDL_HEADER.XPCOM  = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 # The MS COM specific stuff.
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
  OTHERS         += \
  	$(VBOX_IDL_FILE.MSCOM)
  OTHER_CLEAN    += \
@@ -1478,7 +1478,7 @@ if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "linux" && !defined(VBO
 endif
 
 
-if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS)
+if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_SDK)
  #
  # Experimental COM proxy + stub DLL w/ automatic registration updating.
  #
@@ -1658,7 +1658,7 @@ $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c: $(VBOX_PATH_MAIN_SRC)/idl/xpidl_iid.xs
 	$(call MSG_TOOL,xsltproc,VBoxSVC,$<,$@)
 	$(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
 
  # Note! Because we've got a different proxy stub DLL for pre windows 7 64-bit hosts, we target windows 7 for AMD64.
  #       The output is different and hopefully more efficient, at least memory wise (using more helpers in OLE32).
@@ -1730,7 +1730,7 @@ if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
 	$(call def_VBoxMidlOutputDisableMscWarnings,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox_p.c)
  endif
 
-endif # defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+endif # "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
 
 #
 # Translation stuff
diff --git a/src/VBox/Main/cbinding/Makefile.kmk b/src/VBox/Main/cbinding/Makefile.kmk
index 8246d2265ea..9eccab17973 100644
--- a/src/VBox/Main/cbinding/Makefile.kmk
+++ b/src/VBox/Main/cbinding/Makefile.kmk
@@ -81,7 +81,7 @@ $$(CAPIHeaders_0_OUTDIR)/VBoxCAPI.h: \
 	$(call MSG_TOOL,xsltproc,CAPIHeaders,$<,$@)
 	$(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
-if !defined(VBOX_ONLY_SDK)
+ifndef VBOX_ONLY_SDK
 
  #
  # The C API binding utility DLL
@@ -181,7 +181,7 @@ if !defined(VBOX_ONLY_SDK)
   endif
  endif
 
-endif # ! VBOX_ONLY_SDK
+endif # !VBOX_ONLY_SDK
 
 # generate rules.
 include $(FILE_KBUILD_SUB_FOOTER)