Changeset 14158 in vbox

Timestamp:

Nov 13, 2008 2:53:38 AM (16 years ago)

Author:

vboxsync

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

39249

Message:

src,src/VBox: makefile fix.

Location:

trunk/src

Files:

• Makefile.kmk (modified) (4 diffs)
• VBox/Makefile.kmk (modified) (3 diffs)

trunk/src/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ..
 include $(KBUILD_PATH)/subheader.kmk
+
+ifdef VBOX_SINGLE_MAKEFILE
 
 ifdef VBOX_ONLY_ADDITIONS
@@ -52 +53 @@
 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS && !VBOX_ONLY_SDK
 
-include $(KBUILD_PATH)/subfooter.kmk
-
-
 else  # !VBOX_SINGLE_MAKEFILE
 DEPTH  = ..
@@ -70 +68 @@
 else  # !VBOX_ONLY_ADDITIONS
  # Build IPRT first because xpcom (IPC, nspr, python) depends on it.
- SUBDIRS = VBox/Runtime bldprogs libs VBox 
+ SUBDIRS = VBox/Runtime bldprogs libs VBox
 
  ifdef VBOX_WITH_NEW_RECOMPILER
@@ -88 +86 @@
 endif # !VBOX_ONLY_ADDITIONS
 
-include $(KBUILD_PATH)/footer.kmk
-
 endif # !VBOX_SINGLE_MAKEFILE
 
+include $(KBUILD_PATH)/subfooter.kmk
+

trunk/src/VBox/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../..
 include $(KBUILD_PATH)/subheader.kmk
+
+ifdef VBOX_SINGLE_MAKEFILE
 
 ifdef VBOX_ONLY_ADDITIONS
@@ -65 +66 @@
 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
 
-include $(KBUILD_PATH)/subfooter.kmk
-
 else # !VBOX_SINGLE_MAKEFILE
-DEPTH = ../..
-include $(KBUILD_PATH)/header.kmk
 
 ifdef VBOX_ONLY_ADDITIONS
@@ -125 +122 @@
 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
 
-include $(KBUILD_PATH)/footer.kmk
 endif # !VBOX_SINGLE_MAKEFILE
 
+include $(KBUILD_PATH)/subfooter.kmk
+