VirtualBox

Changeset 8730

Show
Ignore:
Timestamp:
05/09/08 03:40:44 (2 months ago)
Author:
vboxsync
Message:

Include the testcase bit using the sub-makefile setup.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8728 r8730  
    11# $Id$ 
    22## @file 
    3 # Makefile for the IPRT (IPRT). 
     3# Sub-Makefile for the IPRT (IPRT). 
    44# 
    55 
    …… 
    3030 
    3131 
    32 DEPTH = ../../.. 
    33 include $(PATH_KBUILD)/header.kmk 
     32DEPTH ?= ../../.. 
     33SUB_DEPTH = . 
     34include $(PATH_KBUILD)/subheader.kmk 
     35 
     36include testcase/Makefile.kmk 
    3437 
    3538ifdef VBOX_ONLY_ADDITIONS 
    …… 
    5558 # Normal build. 
    5659 # 
     60 include testcase/Makefile.kmk 
     61 
    5762 BLDPROGS   = uniread 
    5863 LIBRARIES  = RuntimeR3 RuntimeR0 RuntimeGC RuntimeEFCPP RuntimeR3NoCRTGCC 
    …… 
    8489        $(PATH_TARGET)/docs.iprt 
    8590 
    86  SUBDIRS_AFTER = testcase 
    87 endif 
    88  
    89  
    90 # global (for now at least) 
    91 INCS += include 
     91endif 
     92 
    9293 
    9394# 
    …… 
    9697uniread_TEMPLATE = VBOXBLDPROG 
    9798uniread_SOURCES  = common/string/uniread.cpp 
     99uniread_INCS = include 
    98100 
    99101# 
    …… 
    148150endif 
    149151RuntimeR3_INCS          = \ 
     152        include \ 
    150153        $(PATH_ROOT)/src/libs/liblzf-1.51 
    151154ifdef IPRT_WITH_KSTUFF 
    …… 
    495498RuntimeR3L4_DEFS         += __PIC__ 
    496499endif 
    497 RuntimeR3L4_INCS          = $(L4_INCDIR) 
     500RuntimeR3L4_INCS          = \ 
     501        include \ 
     502        $(L4_INCDIR) 
    498503 
    499504RuntimeR3L4_SOURCES = \ 
    …… 
    699704RuntimeR3NoCRTGCC_TEMPLATE = VBOXNOCRTGCC 
    700705RuntimeR3NoCRTGCC_LIBSUFF = $(VBOX_SUFF_LIB) 
     706RuntimeR3NoCRTGCC_INCS  = include 
    701707RuntimeR3NoCRTGCC_SOURCES  = \ 
    702708        common/misc/sanity-cpp.cpp \ 
    …… 
    776782RuntimeR0_TEMPLATE      = VBOXR0 
    777783RuntimeR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS 
     784RuntimeR0_INCS          = include 
    778785RuntimeR0_SOURCES       = \ 
    779786        common/log/logcom.cpp \ 
    …… 
    868875RuntimeR0Drv_TEMPLATE   = VBOXR0DRV 
    869876RuntimeR0Drv_SDKS.win   = W2K3DDK WINPSDKINCS 
    870 RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) 
     877RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) include 
    871878RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS 
    872879RuntimeR0Drv_DEFS.win   = IN_SUP_R0 
    …… 
    11181125RuntimeGuestR0_DEFS                    := $(RuntimeR0Drv_DEFS) 
    11191126RuntimeGuestR0_DEFS.$(BUILD_TARGET)    := $(RuntimeR0Drv_DEFS.$(BUILD_TARGET)) 
    1120 RuntimeGuestR0_INCS                    := $(PATH_SUB_CURRENT) 
     1127RuntimeGuestR0_INCS                    := $(PATH_SUB_CURRENT) include 
    11211128RuntimeGuestR0_INCS.$(BUILD_TARGET)    := $(RuntimeR0Drv_INCS.$(BUILD_TARGET)) 
    11221129RuntimeGuestR0_SOURCES                 := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES)) 
    …… 
    11481155RuntimeW32GuestR0_TEMPLATE      = VBOXW32GUESTR0LIB 
    11491156RuntimeW32GuestR0_SDKS          = W2K3DDKX86 WINPSDKINCS 
    1150 RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT) 
     1157RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT) include 
    11511158RuntimeW32GuestR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0 
    11521159RuntimeW32GuestR0_DEFS.$(BUILD_TARGET) = 
    …… 
    11791186RuntimeGC_TEMPLATE      = VBOXGC 
    11801187RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS 
     1188RuntimeGC_INCS          = include 
    11811189RuntimeGC_SOURCES       = \ 
    11821190        common/log/log.cpp \ 
    …… 
    12751283 
    12761284 
    1277 # Generate the rules 
    1278 include $(PATH_KBUILD)/footer.kmk 
     1285# 
     1286# Generate the rules (we're the to sub-makefile). 
     1287# 
     1288include $(PATH_KBUILD)/subfooter.kmk 
    12791289 
    12801290 

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

    r8727 r8730  
    11# $Id$ 
    22## @file 
    3 # Makefile for the IPRT testcases. 
     3# Sub-Makefile for the IPRT testcases. 
    44# 
    55 
    …… 
    2929# 
    3030 
    31 DEPTH = ../../../.. 
    32 include $(PATH_KBUILD)/header.kmk 
     31DEPTH ?= ../../../.. 
     32SUB_DEPTH = .. 
     33include $(PATH_KBUILD)/subheader.kmk 
    3334 
    3435ifdef VBOX_WITH_TESTCASES 
    …… 
    135136# Note: tstErrUnique.cpp depends on a header generated by the makefile above us. 
    136137tstErrUnique_SOURCES = tstErrUnique.cpp 
    137 tstErrUnique_INCS = $(PATH_TARGET)/.. 
    138 tstErrUnique.cpp_DEPS = $(PATH_TARGET)/../errmsgdata.h 
     138tstErrUnique_INCS = $(PATH_TARGET)/ 
     139tstErrUnique.cpp_DEPS = $(PATH_TARGET)/errmsgdata.h 
    139140 
    140141tstFile_SOURCES = tstFile.cpp 
    …… 
    290291endif # VBOX_WITH_TESTCASES 
    291292 
    292 include $(PATH_KBUILD)/footer.kmk 
    293  
     293include $(PATH_KBUILD)/subfooter.kmk 
     294 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy