Changeset 8730 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 9, 2008 1:40:44 AM (17 years ago)

Author:

vboxsync

Message:

Include the testcase bit using the sub-makefile setup.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (14 diffs)
• testcase/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the IPRT (IPRT).
+# Sub-Makefile for the IPRT (IPRT).
 #
 
@@ -30 +30 @@
 
 
-DEPTH = ../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../..
+SUB_DEPTH = .
+include $(PATH_KBUILD)/subheader.kmk
+
+include testcase/Makefile.kmk
 
 ifdef VBOX_ONLY_ADDITIONS
@@ -55 +58 @@
  # Normal build.
  #
+ include testcase/Makefile.kmk
+
  BLDPROGS   = uniread
  LIBRARIES  = RuntimeR3 RuntimeR0 RuntimeGC RuntimeEFCPP RuntimeR3NoCRTGCC
@@ -84 +89 @@
         $(PATH_TARGET)/docs.iprt
 
- SUBDIRS_AFTER = testcase
-endif
-
-
-# global (for now at least)
-INCS += include
+endif
+
 
 #
@@ -96 +97 @@
 uniread_TEMPLATE = VBOXBLDPROG
 uniread_SOURCES  = common/string/uniread.cpp
+uniread_INCS = include
 
 #
@@ -148 +150 @@
 endif
 RuntimeR3_INCS          = \
+        include \
         $(PATH_ROOT)/src/libs/liblzf-1.51
 ifdef IPRT_WITH_KSTUFF
@@ -495 +498 @@
 RuntimeR3L4_DEFS         += __PIC__
 endif
-RuntimeR3L4_INCS          = $(L4_INCDIR)
+RuntimeR3L4_INCS          = \
+        include \
+        $(L4_INCDIR)
 
 RuntimeR3L4_SOURCES = \
@@ -699 +704 @@
 RuntimeR3NoCRTGCC_TEMPLATE = VBOXNOCRTGCC
 RuntimeR3NoCRTGCC_LIBSUFF = $(VBOX_SUFF_LIB)
+RuntimeR3NoCRTGCC_INCS  = include
 RuntimeR3NoCRTGCC_SOURCES  = \
         common/misc/sanity-cpp.cpp \
@@ -776 +782 @@
 RuntimeR0_TEMPLATE      = VBOXR0
 RuntimeR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS
+RuntimeR0_INCS          = include
 RuntimeR0_SOURCES       = \
         common/log/logcom.cpp \
@@ -868 +875 @@
 RuntimeR0Drv_TEMPLATE   = VBOXR0DRV
 RuntimeR0Drv_SDKS.win   = W2K3DDK WINPSDKINCS
-RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT)
+RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) include
 RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS
 RuntimeR0Drv_DEFS.win   = IN_SUP_R0
@@ -1118 +1125 @@
 RuntimeGuestR0_DEFS                    := $(RuntimeR0Drv_DEFS)
 RuntimeGuestR0_DEFS.$(BUILD_TARGET)    := $(RuntimeR0Drv_DEFS.$(BUILD_TARGET))
-RuntimeGuestR0_INCS                    := $(PATH_SUB_CURRENT)
+RuntimeGuestR0_INCS                    := $(PATH_SUB_CURRENT) include
 RuntimeGuestR0_INCS.$(BUILD_TARGET)    := $(RuntimeR0Drv_INCS.$(BUILD_TARGET))
 RuntimeGuestR0_SOURCES                 := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
@@ -1148 +1155 @@
 RuntimeW32GuestR0_TEMPLATE      = VBOXW32GUESTR0LIB
 RuntimeW32GuestR0_SDKS          = W2K3DDKX86 WINPSDKINCS
-RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT)
+RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT) include
 RuntimeW32GuestR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0
 RuntimeW32GuestR0_DEFS.$(BUILD_TARGET) =
@@ -1179 +1186 @@
 RuntimeGC_TEMPLATE      = VBOXGC
 RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS
+RuntimeGC_INCS          = include
 RuntimeGC_SOURCES       = \
         common/log/log.cpp \
@@ -1275 +1283 @@
 
 
-# Generate the rules
-include $(PATH_KBUILD)/footer.kmk
+#
+# Generate the rules (we're the to sub-makefile).
+#
+include $(PATH_KBUILD)/subfooter.kmk
 
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the IPRT testcases.
+# Sub-Makefile for the IPRT testcases.
 #
 
@@ -29 +29 @@
 #
 
-DEPTH = ../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../..
+SUB_DEPTH = ..
+include $(PATH_KBUILD)/subheader.kmk
 
 ifdef VBOX_WITH_TESTCASES
@@ -135 +136 @@
 # Note: tstErrUnique.cpp depends on a header generated by the makefile above us.
 tstErrUnique_SOURCES = tstErrUnique.cpp
-tstErrUnique_INCS = $(PATH_TARGET)/..
-tstErrUnique.cpp_DEPS = $(PATH_TARGET)/../errmsgdata.h
+tstErrUnique_INCS = $(PATH_TARGET)/
+tstErrUnique.cpp_DEPS = $(PATH_TARGET)/errmsgdata.h
 
 tstFile_SOURCES = tstFile.cpp
@@ -290 +291 @@
 endif # VBOX_WITH_TESTCASES
 
-include $(PATH_KBUILD)/footer.kmk
-
+include $(PATH_KBUILD)/subfooter.kmk
+