Changeset 14158
- Timestamp:
- 11/13/08 03:53:38 (2 months ago)
- Files:
-
- trunk/src/Makefile.kmk (modified) (4 diffs)
- trunk/src/VBox/Makefile.kmk (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/Makefile.kmk
r13230 r14158 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = .. 24 23 include $(KBUILD_PATH)/subheader.kmk 24 25 ifdef VBOX_SINGLE_MAKEFILE 25 26 26 27 ifdef VBOX_ONLY_ADDITIONS … … 52 53 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS && !VBOX_ONLY_SDK 53 54 54 include $(KBUILD_PATH)/subfooter.kmk55 56 57 55 else # !VBOX_SINGLE_MAKEFILE 58 56 DEPTH = .. … … 70 68 else # !VBOX_ONLY_ADDITIONS 71 69 # Build IPRT first because xpcom (IPC, nspr, python) depends on it. 72 SUBDIRS = VBox/Runtime bldprogs libs VBox 70 SUBDIRS = VBox/Runtime bldprogs libs VBox 73 71 74 72 ifdef VBOX_WITH_NEW_RECOMPILER … … 88 86 endif # !VBOX_ONLY_ADDITIONS 89 87 90 include $(KBUILD_PATH)/footer.kmk91 92 88 endif # !VBOX_SINGLE_MAKEFILE 93 89 90 include $(KBUILD_PATH)/subfooter.kmk 91 trunk/src/VBox/Makefile.kmk
r14140 r14158 20 20 # 21 21 22 ifdef VBOX_SINGLE_MAKEFILE23 22 SUB_DEPTH = ../.. 24 23 include $(KBUILD_PATH)/subheader.kmk 24 25 ifdef VBOX_SINGLE_MAKEFILE 25 26 26 27 ifdef VBOX_ONLY_ADDITIONS … … 65 66 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS 66 67 67 include $(KBUILD_PATH)/subfooter.kmk68 69 68 else # !VBOX_SINGLE_MAKEFILE 70 DEPTH = ../..71 include $(KBUILD_PATH)/header.kmk72 69 73 70 ifdef VBOX_ONLY_ADDITIONS … … 125 122 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS 126 123 127 include $(KBUILD_PATH)/footer.kmk128 124 endif # !VBOX_SINGLE_MAKEFILE 129 125 126 include $(KBUILD_PATH)/subfooter.kmk 127
