Changeset 12316 in vbox

Timestamp:

Sep 9, 2008 5:18:49 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36332

Message:

Installer/makefile: include win/Makefile.kmk as a proper sub-makefile

File:

• trunk/src/VBox/Installer/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Installer/Makefile.kmk

@@ -23 +23 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifeq ($(KBUILD_HOST),win) # guard when cross-compiling.
- SUBDIRS.win = win
+#
+# Include Sub-Makefiles.
+#
+if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
+ include $(PATH_SUB_CURRENT)/win/Makefile.kmk
+endif
+ifndef VBOX_OSE
+ include $(PATH_SUB_CURRENT)/common/Makefile.kmk
+endif
+
+#
+# To be converted to sub-makefiles.
+#
+ifeq ($(KBUILD_HOST),darwin)
+ SUBDIRS.darwin = darwin
 endif
 ifeq ($(KBUILD_HOST),linux)
  SUBDIRS.linux = linux
-endif
-ifeq ($(KBUILD_HOST),darwin)
- SUBDIRS.darwin = darwin
 endif
 ifeq ($(KBUILD_HOST),solaris)
@@ -36 +46 @@
 endif
 
-ifndef VBOX_OSE
- # Include Sub-Makefiles.
- include $(PATH_SUB_CURRENT)/common/Makefile.kmk
-endif
-
 include $(KBUILD_PATH)/subfooter.kmk