VirtualBox

Changeset 2516 in vbox


Ignore:
Timestamp:
May 5, 2007 2:28:24 AM (18 years ago)
Author:
vboxsync
Message:

Drop the Config.kmk and the abspath macros (kBuild fixes the latter with the default PATH attribute).

Location:
trunk/src/VBox/HostDrivers
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

    r2478 r2516  
    11# $Id$
    22## @file
    3 # Makefile for the VBox Host drivers base directory.
     3# Top-level makefile for the VBox Host drivers.
    44#
    55
    … …  
    2323include $(PATH_KBUILD)/subheader.kmk
    2424
    25 # Include sub-makefile.
    26 include $(VBOX_PATH_HOSTDRIVERS)/Support/Makefile.kmk
     25# Include sub-makefiles.
     26include $(PATH_SUB_CURRENT)/Support/Makefile.kmk
    2727ifeq ($(BUILD_TARGET),win)
    28  include $(VBOX_PATH_HOSTDRIVERS)/VBoxTAP/Makefile.kmk
     28 include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk
    2929 ifdef VBOX_WITH_USB
    30   include $(VBOX_PATH_HOSTDRIVERS)/VBoxUSB/Makefile.kmk
     30  include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
    3131 endif
    3232endif

  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r2478 r2516  
    4242# Include sub-makefile(s).
    4343#
    44 include $(VBOX_PATH_SUPPORT)/testcase/Makefile.kmk
     44include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
    4545
    4646
    4747ifeq ($(BUILD_TARGET),linux)
    4848## @todo change this to use a INSTALLS target.
    49 EXPORT_FILE_PAIRS = \
     49EXPORT_FILE_PAIRS := \
    5050        include/iprt/alloc.h=$(PATH_ROOT)/include/iprt/alloc.h \
    5151        include/iprt/asm.h=$(PATH_ROOT)/include/iprt/asm.h \
    … …  
    7474        include/internal/thread.h=$(PATH_ROOT)/src/VBox/Runtime/include/internal/thread.h \
    7575        include/internal/magics.h=$(PATH_ROOT)/src/VBox/Runtime/include/internal/magics.h \
    76         linux/SUPDrv-linux.c=$(VBOX_PATH_SUPPORT)/linux/SUPDrv-linux.c \
    77         Makefile=$(VBOX_PATH_SUPPORT)/linux/Makefile \
    78         build_in_tmp=$(VBOX_PATH_SUPPORT)/linux/build_in_tmp \
     76        linux/SUPDrv-linux.c=$(PATH_SUB_CURRENT)/linux/SUPDrv-linux.c \
     77        Makefile=$(PATH_SUB_CURRENT)/linux/Makefile \
     78        build_in_tmp=$(PATH_SUB_CURRENT)/linux/build_in_tmp \
    7979        alloc/heapsimple.c=$(PATH_ROOT)/src/VBox/Runtime/alloc/heapsimple.cpp \
    8080        r0drv/alloc-r0drv.c=$(PATH_ROOT)/src/VBox/Runtime/r0drv/alloc-r0drv.cpp \
    … …  
    9090        r0drv/linux/the-linux-kernel.h=$(PATH_ROOT)/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h \
    9191        version-generated.h=$(PATH_OUT)/version-generated.h \
    92         SUPDRV.h=$(VBOX_PATH_SUPPORT)/SUPDRV.h \
    93         SUPDRVIOC.h=$(VBOX_PATH_SUPPORT)/SUPDRVIOC.h \
    94         SUPDRVShared.c=$(VBOX_PATH_SUPPORT)/SUPDRVShared.c
     92        SUPDRV.h=$(PATH_SUB_CURRENT)/SUPDRV.h \
     93        SUPDRVIOC.h=$(PATH_SUB_CURRENT)/SUPDRVIOC.h \
     94        SUPDRVShared.c=$(PATH_SUB_CURRENT)/SUPDRVShared.c
    9595OTHERS       := $(foreach pair,$(EXPORT_FILE_PAIRS),$(PATH_BIN)/src/$(firstword $(subst =, ,$(pair))))
    9696OTHER_CLEAN   = $(OTHERS)
    … …  
    109109endif
    110110SUPR3_DEFS          = IN_SUP_R3 IN_RT_R3
    111 SUPR3_INCS          = $(VBOX_PATH_SUPPORT)
     111SUPR3_INCS         := $(PATH_SUB_CURRENT)
    112112SUPR3_INCS.l4       = $(L4_INCDIR)
    113113ifneq ($(BUILD_TARGET),win) ## @todo rename win32 -> win!
    114114SUPR3_SOURCES       = \
    115         $(VBOX_PATH_SUPPORT)/SUPLib.cpp \
    116         $(VBOX_PATH_SUPPORT)/$(BUILD_TARGET)/SUPLib-$(BUILD_TARGET).cpp
     115        SUPLib.cpp \
     116        $(BUILD_TARGET)/SUPLib-$(BUILD_TARGET).cpp
    117117else
    118118SUPR3_SOURCES       = \
    119         $(VBOX_PATH_SUPPORT)/SUPLib.cpp \
    120         $(VBOX_PATH_SUPPORT)/win32/SUPLib-win32.cpp
     119        SUPLib.cpp \
     120        win32/SUPLib-win32.cpp
    121121endif
    122122
    … …  
    126126SUPR0_TEMPLATE      = VBOXR0
    127127ifeq ($(VBOX_LDR_FMT),pe)
    128 SUPR0_SOURCES       += $(VBOX_PATH_SUPPORT)/SUPR0.def
     128SUPR0_SOURCES       += SUPR0.def
    129129endif
    130130ifeq ($(VBOX_LDR_FMT),lx)
    131131SUPR0_SOURCES       += $(PATH_TARGET)/SUPR0.def
    132 $(PATH_TARGET)/SUPR0.def: $(VBOX_PATH_SUPPORT)/SUPR0.def | $(call DIRDEP,$(PATH_TARGET))
     132$(PATH_TARGET)/SUPR0.def: $(PATH_SUB_CURRENT)/SUPR0.def | $(call DIRDEP,$(PATH_TARGET))
    133133        $(SED) -e 's/^[ \t][ \t]*\([gA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' $< > [email protected]
    134134        $(MV) -f [email protected] $@
    … …  
    143143VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0
    144144VBoxDrv_SDKS          = W2K3DDK WINPSDKINCS
    145 VBoxDrv_INCS          = $(VBOX_PATH_SUPPORT)
     145VBoxDrv_INCS         := $(PATH_SUB_CURRENT)
    146146VBoxDrv_SOURCES       = \
    147         $(VBOX_PATH_SUPPORT)/SUPDRVShared.c
     147        SUPDRVShared.c
    148148VBoxDrv_SOURCES.x86   = \
    149         $(VBOX_PATH_SUPPORT)/win32/SUPDrv-win32.cpp \
    150         $(VBOX_PATH_SUPPORT)/win32/SUPDrvA-win32.asm
     149        win32/SUPDrv-win32.cpp \
     150        win32/SUPDrvA-win32.asm
    151151VBoxDrv_SOURCES.amd64 = \
    152         $(VBOX_PATH_SUPPORT)/win64/SUPDrv-win64.cpp \
    153         $(VBOX_PATH_SUPPORT)/win64/SUPDrvA-win64.asm
     152        win64/SUPDrv-win64.cpp \
     153        win64/SUPDrvA-win64.asm
    154154VBoxDrv_LDFLAGS.x86   = -Entry:DriverEntry@8
    155155VBoxDrv_LDFLAGS.amd64 = -Entry:DriverEntry
    … …  
    167167vboxdrv_TEMPLATE      = VBOXR0DRV
    168168vboxdrv_DEFS          = KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE IN_RT_R0 IN_SUP_R0 CONFIG_VBOXDRV_AS_MISC
    169 vboxdrv_INCS          = $(VBOX_PATH_SUPPORT)
     169vboxdrv_INCS         := $(PATH_SUB_CURRENT)
    170170vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    171171vboxdrv_LIBS.debug    = $(vboxdrv_LIBS) $(VBOX_GCC_LIBGCC)
    172172vboxdrv_SOURCES       = \
    173         $(VBOX_PATH_SUPPORT)/$(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).c \
    174         $(VBOX_PATH_SUPPORT)/SUPDRVShared.c
     173        $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).c \
     174        SUPDRVShared.c
    175175ifndef VBOX_LINUX_VERSION_2_4
    176176vboxdrv_SOURCES      += \
    177         $(VBOX_PATH_SUPPORT)/$(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).mod.c
     177        $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).mod.c
    178178endif
    179179endif # real linux
    … …  
    187187VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    188188VBoxDrv_DEFS         += DEBUG_DARWIN_GIP
    189 VBoxDrv_INCS          = $(VBOX_PATH_SUPPORT)
     189VBoxDrv_INCS         := $(PATH_SUB_CURRENT)
    190190VBoxDrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    191191VBoxDrv_LDFLAGS       = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
    192192VBoxDrv_INST          = $(INST_VBOXDRV)Contents/MacOS/
    193193VBoxDrv_SOURCES       = \
    194         $(VBOX_PATH_SUPPORT)/SUPDRVShared.c \
    195         $(VBOX_PATH_SUPPORT)/$(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).cpp
     194        SUPDRVShared.c \
     195        $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).cpp
    196196
    197197INSTALLS += VBoxDrv.kext
    … …  
    200200        $(PATH_TARGET)/Info.plist
    201201
    202 $(PATH_TARGET)/Info.plist: $(VBOX_PATH_SUPPORT)/darwin/Info.plist $(VBOX_VERSION_MK) | $(call DIRDEP,$(PATH_TARGET))
     202$(PATH_TARGET)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $(call DIRDEP,$(PATH_TARGET))
    203203        $(call MSG_GENERATE,VBoxDrv,$@,$<)
    204204        $(xQUIET)$(RM) -f $@
    … …  
    213213Scripts_INST     = $(INST_DIST)
    214214Scripts_SOURCES  = \
    215         $(VBOX_PATH_SUPPORT)/darwin/load.sh
     215        darwin/load.sh
    216216
    217217endif
    … …  
    224224VBoxDrv_TEMPLATE      = VBOXR0DRV
    225225VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    226 VBoxDrv_INCS          = $(VBOX_PATH_SUPPORT)
     226VBoxDrv_INCS         := $(PATH_SUB_CURRENT)
    227227#VBoxDrv_LDFLAGS       = -s -t -v
    228228VBoxDrv_SOURCES       = \
    229         $(VBOX_PATH_SUPPORT)/os2/SUPDrvA-os2.asm \
    230         $(VBOX_PATH_SUPPORT)/os2/SUPDrv-os2.def
     229        os2/SUPDrvA-os2.asm \
     230        os2/SUPDrv-os2.def
    231231VBoxDrv_LIBS          = \
    232232        $(TARGET_VBoxDrvLib) \
    … …  
    240240VBoxDrvLib_NOINST     = 1
    241241VBoxDrvLib_DEFS       = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    242 VBoxDrvLib_INCS       = $(VBOX_PATH_SUPPORT) $(PATH_TARGET) $(PATH_ROOT)/src/VBox/Runtime/include
     242VBoxDrvLib_INCS      := \
     243        $(PATH_SUB_CURRENT) \
     244        $(PATH_TARGET) \
     245        $(PATH_ROOT)/src/VBox/Runtime/include
    243246VBoxDrvLib_SOURCES    = \
    244         $(VBOX_PATH_SUPPORT)/os2/SUPDrv-os2.cpp \
    245         $(VBOX_PATH_SUPPORT)/SUPDRVShared.c
     247        os2/SUPDrv-os2.cpp \
     248        SUPDRVShared.c
    246249endif
    247250

  • trunk/src/VBox/HostDrivers/Support/testcase/Makefile.kmk

    r2478 r2516  
    2121
    2222DEPTH = ../../../../..
    23 SUB_DEPTH = ..
     23SUB_DEPTH = ../..
    2424include $(PATH_KBUILD)/subheader.kmk
    2525
    … …  
    4040
    4141SUPInstall_TEMPLATE   = VBOXR3EXE
    42 SUPInstall_SOURCES    = $(VBOX_PATH_SUPPORT)/testcase/SUPInstall.cpp
     42SUPInstall_SOURCES    = SUPInstall.cpp
    4343SUPInstall_LIBS       = $(LIB_RUNTIME)
    4444
    4545SUPUninstall_TEMPLATE = VBOXR3EXE
    46 SUPUninstall_SOURCES  = $(VBOX_PATH_SUPPORT)/testcase/SUPUninstall.cpp
     46SUPUninstall_SOURCES  = SUPUninstall.cpp
    4747SUPUninstall_LIBS     = $(LIB_RUNTIME)
    4848
    4949tstInt_TEMPLATE       = VBOXR3EXE
    50 tstInt_SOURCES        = $(VBOX_PATH_SUPPORT)/testcase/tstInt.cpp
     50tstInt_SOURCES        = tstInt.cpp
    5151tstInt_LIBS           = $(LIB_RUNTIME)
    5252
    5353tstContiguous_TEMPLATE= VBOXR3TSTEXE
    54 tstContiguous_SOURCES = $(VBOX_PATH_SUPPORT)/testcase/tstContiguous.cpp
     54tstContiguous_SOURCES = tstContiguous.cpp
    5555
    5656tstInit_TEMPLATE      = VBOXR3TSTEXE
    57 tstInit_SOURCES       = $(VBOX_PATH_SUPPORT)/testcase/tstInit.cpp
     57tstInit_SOURCES       = tstInit.cpp
    5858
    5959tstLow_TEMPLATE       = VBOXR3TSTEXE
    60 tstLow_SOURCES        = $(VBOX_PATH_SUPPORT)/testcase/tstLow.cpp
     60tstLow_SOURCES        = tstLow.cpp
    6161
    6262tstPin_TEMPLATE       = VBOXR3TSTEXE
    63 tstPin_SOURCES        = $(VBOX_PATH_SUPPORT)/testcase/tstPin.cpp
     63tstPin_SOURCES        = tstPin.cpp
    6464
    6565tstPage_TEMPLATE      = VBOXR3TSTEXE
    66 tstPage_SOURCES       = $(VBOX_PATH_SUPPORT)/testcase/tstPage.cpp
     66tstPage_SOURCES       = tstPage.cpp
    6767
    6868tstGIP-2_TEMPLATE     = VBOXR3TSTEXE
    69 tstGIP-2_SOURCES      = $(VBOX_PATH_SUPPORT)/testcase/tstGIP-2.cpp
     69tstGIP-2_SOURCES      = tstGIP-2.cpp
    7070
    7171tstGetPagingMode_TEMPLATE = VBOXR3TSTEXE
    72 tstGetPagingMode_SOURCES = $(VBOX_PATH_SUPPORT)/testcase/tstGetPagingMode.cpp
     72tstGetPagingMode_SOURCES = tstGetPagingMode.cpp
    7373
    7474include $(PATH_KBUILD)/subfooter.kmk

  • trunk/src/VBox/HostDrivers/VBoxTAP/Makefile.kmk

    r2478 r2516  
    2424include $(PATH_KBUILD)/subheader.kmk
    2525
    26 SYSMODS.win += VBoxTAP
    27 INSTALLS.win += VBoxTAP-inf
    2826
    2927
    … …  
    3129# VBoxTap
    3230#
     31SYSMODS.win += VBoxTAP
    3332VBoxTAP_TEMPLATE    = VBOXR0DRV
    3433VBoxTAP_SDKS        = W2K3DDK WINPSDKINCS
    … …  
    3635VBoxTAP_LDFLAGS.amd64 = -Entry:DriverEntry
    3736VBoxTAP_SOURCES     = \
    38         $(VBOX_PATH_VBOXTAP)/tapdrvr.c \
    39         $(VBOX_PATH_VBOXTAP)/VBoxTAP.rc
     37        tapdrvr.c \
     38        VBoxTAP.rc
    4039VBoxTAP_LIBS        = \
    4140        $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
    … …  
    4948# Install the .inf.
    5049#
     50INSTALLS.win += VBoxTAP-inf
    5151VBoxTAP-inf_INST = bin/
    5252VBoxTAP-inf_MODE = a+r,u+w
    53 VBoxTAP-inf_SOURCES = $(VBOX_PATH_VBOXTAP)/VBoxTAP.inf
     53VBoxTAP-inf_SOURCES = VBoxTAP.inf
    5454
    5555
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