VirtualBox

Changeset 10048 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jul 1, 2008 12:47:54 AM (17 years ago)
Author:
vboxsync
Message:

VBOX_KBUILD_HACKING

Location:
trunk/src/VBox/Runtime
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r10023 r10048  
    2929#
    3030
    31 
    32 DEPTH ?= ../../..
     31ifdef VBOX_KBUILD_HACKING
     32SUB_DEPTH = ../../..
     33else
    3334SUB_DEPTH = .
     35DEPTH    ?= ../../..
     36endif
    3437include $(KBUILD_PATH)/subheader.kmk
    3538
    … …  
    3841 # Only build the additions, sort out the legacy names first.
    3942 #
    40  LIBRARIES = RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
     43 LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    4144 #LIBRARIES.os2 = RuntimeGuestR0OS2Warp3
    42  LIBRARIES.win.x86 = RuntimeGuestR0NT4
     45 LIBRARIES.win.x86 += RuntimeGuestR0NT4
    4346 ifndef VBOX_WITH_ADDITION_DRIVERS
    4447  if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
    … …  
    5255 # Normal build.
    5356 #
    54  include testcase/Makefile.kmk
    55 
    56  BLDPROGS   = uniread
    57  LIBRARIES  = RuntimeR3 RuntimeR0 RuntimeGC RuntimeEFCPP RuntimeR3NoCRTGCC
     57 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
     58
     59 BLDPROGS += uniread
     60 LIBRARIES += RuntimeR3 RuntimeR0 RuntimeGC RuntimeEFCPP RuntimeR3NoCRTGCC
    5861 ifdef VBOX_WITH_VBOXDRV
    5962  LIBRARIES += RuntimeR0Drv
    … …  
    6164 ifdef VBOX_WITH_ADDITIONS
    6265  LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    63   #LIBRARIES.os2 = RuntimeGuestR0OS2Warp3
    64   LIBRARIES.win.x86 = RuntimeGuestR0NT4
     66  #LIBRARIES.os2 += RuntimeGuestR0OS2Warp3
     67  LIBRARIES.win.x86 += RuntimeGuestR0NT4
    6568  ifndef VBOX_WITH_ADDITION_DRIVERS
    6669   if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
    … …  
    6972  endif
    7073 endif # VBOX_WITH_ADDITIONS
    71  LIBRARIES.l4 = RuntimeR3L4 RuntimeLnxHostR3
    72  DLLS = VBoxRT
    73  OTHER_CLEAN = \
     74 LIBRARIES.l4 += RuntimeR3L4 RuntimeLnxHostR3
     75 DLLS += VBoxRT
     76 OTHER_CLEAN += \
    7477        $(PATH_TARGET)/errmsgdata.h \
    7578        $(PATH_TARGET)/errmsgcomdata.h \
    … …  
    7982
    8083endif
     84
     85
     86#
     87# Globals
     88#
     89VBOX_PATH_RUNTIME_SRC := $(PATH_SUB_CURRENT)
    8190
    8291
    … …  
    11621171#                  made irrelevant even for RuntimeR0Drv).
    11631172#
    1164 RuntimeGuestR0_TEMPLATE                := VBOXGUESTR0LIB
    1165 RuntimeGuestR0_SOURCES                 := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
    1166 RuntimeGuestR0_SOURCES                 += VBox/logbackdoor.cpp
    1167 RuntimeGuestR0_EXTENDS                 = RuntimeR0Drv
     1173RuntimeGuestR0_TEMPLATE  := VBOXGUESTR0LIB
     1174RuntimeGuestR0_SOURCES   := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
     1175RuntimeGuestR0_SOURCES   += VBox/logbackdoor.cpp
     1176RuntimeGuestR0_EXTENDS    = RuntimeR0Drv
    11681177
    11691178# HACK: no vbi for the solaris guest additions - yet.
    … …  
    13321341# Generate the status code data.
    13331342#
    1334 $(PATH_TARGET)/errmsgdata.h: common/err/errmsg.sed $(DEPTH)/include/iprt/err.h $(DEPTH)/include/VBox/err.h
     1343$(PATH_TARGET)/errmsgdata.h: \
     1344                $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \
     1345                $(PATH_ROOT)/include/iprt/err.h \
     1346                $(PATH_ROOT)/include/VBox/err.h
    13351347        $(call MSG_GENERATE,,$@,$(filter %.h,$^))
    13361348        $(QUIET)$(MKDIR) -p $(PATH_TARGET)
    … …  
    13381350
    13391351## @todo r=bird: rename this to indicate that it's not only COM errors, but all win32/64 errors.
    1340 $(PATH_TARGET)/errmsgcomdata.h: common/err/errmsgcom.sed $(PATH_SDK_WINPSDK_INC)/WinError.h
     1352$(PATH_TARGET)/errmsgcomdata.h: \
     1353                $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsgcom.sed \
     1354                $(PATH_SDK_WINPSDK_INC)/WinError.h
    13411355        $(call MSG_GENERATE,,$@,$(filter %.h,$^))
    13421356        $(QUIET)$(MKDIR) -p $(PATH_TARGET)
    … …  
    13591373        $(PATH_ROOT)/include/iprt/nocrt/x86 \
    13601374        $(PATH_ROOT)/include/iprt/nocrt/amd64 \
    1361         include/internal \
    1362         common/alloc \
    1363         common/checksum \
    1364         common/err \
    1365         common/ldr \
    1366         common/log \
    1367         common/misc \
    1368         common/string \
    1369         common/table \
    1370         common/time \
    1371         VBox/ \
    1372         $(foreach dir, . r3 r0drv,\
     1375        $(VBOX_PATH_RUNTIME_SRC)/include/internal \
     1376        $(VBOX_PATH_RUNTIME_SRC)/common/alloc \
     1377        $(VBOX_PATH_RUNTIME_SRC)/common/checksum \
     1378        $(VBOX_PATH_RUNTIME_SRC)/common/err \
     1379        $(VBOX_PATH_RUNTIME_SRC)/common/ldr \
     1380        $(VBOX_PATH_RUNTIME_SRC)/common/log \
     1381        $(VBOX_PATH_RUNTIME_SRC)/common/misc \
     1382        $(VBOX_PATH_RUNTIME_SRC)/common/string \
     1383        $(VBOX_PATH_RUNTIME_SRC)/common/table \
     1384        $(VBOX_PATH_RUNTIME_SRC)/common/time \
     1385        $(VBOX_PATH_RUNTIME_SRC)/VBox \
     1386        $(foreach dir, $(VBOX_PATH_RUNTIME_SRC) $(VBOX_PATH_RUNTIME_SRC)/r3 $(VBOX_PATH_RUNTIME_SRC)/r0drv,\
    13731387                $(dir) \
    13741388                $(dir)/darwin \
    … …  
    14051419
    14061420# Generate the Doxyfile
    1407 $(PATH_TARGET)/Doxyfile: Doxyfile Makefile.kmk \
     1421$(PATH_TARGET)/Doxyfile: $(VBOX_PATH_RUNTIME_SRC)/Doxyfile $(VBOX_PATH_RUNTIME_SRC)/Makefile.kmk \
    14081422                $(comp-vars DOXYGEN_INPUT,DOXYGEN_INPUT_PREV,FORCE) \
    14091423                $(comp-vars DOXYGEN_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \
    14101424                | $(call DIRDEP, $(PATH_TARGET))
    14111425        $(RM) -f $@ [email protected] $(PATH_TARGET)/Doxyfile.dep
    1412         $(CP) -f Doxyfile [email protected]
     1426        $(CP) -f $(VBOX_PATH_RUNTIME_SRC)/Doxyfile [email protected]
    14131427        $(APPEND) [email protected]
    14141428        $(APPEND) [email protected] "OUTPUT_DIRECTORY = $(DOXYGEN_OUTPUT)"

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

    r9502 r10048  
    2929#
    3030
    31 DEPTH ?= ../../../..
     31ifdef VBOX_KBUILD_HACKING
     32SUB_DEPTH = ../../../..
     33else
    3234SUB_DEPTH = ..
     35DEPTH    ?= ../../../..
     36endif
    3337include $(KBUILD_PATH)/subheader.kmk
    3438
    … …  
    4650# Target lists
    4751#
    48 PROGRAMS = \
     52PROGRAMS += \
    4953        tstAvl \
    5054        tstBitOperations \
    … …  
    8488        tstUuid
    8589# tstSems
    86 PROGRAMS.win = \
     90PROGRAMS.win += \
    8791        tstRTProcWait \
    8892        tstCritSectW32 \
    8993        tstFileAppendWin-1 \
    9094        ntGetTimerResolution
    91 PROGRAMS.linux = \
     95PROGRAMS.linux += \
    9296        tstRTProcWait \
    9397        tstBitOperationsPIC3 \
    … …  
    9599        tstInlineAsmPIC3 \
    96100        tstSemMutex
    97 PROGRAMS.l4 = \
     101PROGRAMS.l4 += \
    98102        tstIoCtl
    99 SYSMODS = \
     103SYSMODS += \
    100104        tstLdrObj \
    101105        tstLdrObjR0
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette