VirtualBox

Changeset 2487 in vbox


Ignore:
Timestamp:
May 4, 2007 3:19:31 AM (18 years ago)
Author:
vboxsync
Message:

Converted common and winnt to use sub-makefiles.

Location:
trunk/src/VBox/Additions
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r2478 r2487  
    2121
    2222DEPTH = ../../..
    23 include $(PATH_KBUILD)/header.kmk
     23include $(PATH_KBUILD)/subheader.kmk
    2424
    25 SUBDIRS       = common
     25# Include sub-makefiles.
     26include $(PATH_SUB_CURRENT)/common/Makefile.kmk
    2627ifdef VBOX_WITH_WIN32_ADDITIONS
    27 SUBDIRS      += WINNT
     28include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk
    2829endif
     30
    2931ifdef VBOX_WITH_LINUX_ADDITIONS
    3032SUBDIRS      += linux
    … …  
    3234endif
    3335ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),)
    34 PACKING      += $(PATH_BIN)/additions/VBoxGuestAdditions.iso
     36PACKING += $(PATH_BIN)/additions/VBoxGuestAdditions.iso
    3537endif
    3638
    … …  
    4951
    5052
    51 include $(PATH_KBUILD)/footer.kmk
     53include $(PATH_KBUILD)/subfooter.kmk
    5254
    5355

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for VBoxDisp.dll.
     3# Sub-Makefile for VBoxDisp.dll.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../../..
     23SUB_DEPTH = ../../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 SYSMODS = VBoxDisp
    26 
     26SYSMODS += VBoxDisp
    2727VBoxDisp_TEMPLATE    = VBOXW32GUESTR0
    2828VBoxDisp_SDKS        = W2K3DDKX86 WINPSDKINCS
    … …  
    5656
    5757
    58 include $(PATH_KBUILD)/footer.kmk
     58include $(PATH_KBUILD)/subfooter.kmk
    5959

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/Mirror/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the VirtualBox Windows Guest Mirror Graphics driver.
     3# Sub-Makefile for the VirtualBox Windows Guest Mirror Graphics driver.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../../../..
     23SUB_DEPTH = ../../../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 SYSMODS = vrdpdd
    26 
     26SYSMODS += vrdpdd
    2727vrdpdd_TEMPLATE    = VBOXW32GUESTR0
    2828vrdpdd_SDKS        = W2K3DDKX86
    … …  
    4343
    4444
    45 include $(PATH_KBUILD)/footer.kmk
     45include $(PATH_KBUILD)/subfooter.kmk
    4646

  • trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Base makefile for the Windows guest graphics driver.
     3# Sub-Makefile for the Windows guest graphics driver.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../..
    23 SUBDIRS = Miniport Display
    24 include $(PATH_KBUILD)/rules.kmk
     22DEPTH ?= ../../../../..
     23SUB_DEPTH = ../..
     24include $(PATH_KBUILD)/subheader.kmk
    2525
     26# Include sub-makefiles.
     27include $(PATH_SUB_CURRENT)/Miniport/Makefile.kmk
     28include $(PATH_SUB_CURRENT)/Display/Makefile.kmk
     29
     30include $(PATH_KBUILD)/subfooter.kmk
     31

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for VBoxVideo.
     3# Sub-Makefile for VBoxVideo.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../../..
     23SUB_DEPTH = ../../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 SYSMODS = VBoxVideo
    2626
    2727# This has to run on NT4!
     28SYSMODS += VBoxVideo
    2829VBoxVideo_TEMPLATE    = VBOXW32GUESTR0
    2930VBoxVideo_SDKS        = W2K3DDKX86 WINPSDKINCS
    … …  
    4445        $(PATH_LIB)/additions/RuntimeW32NT4GuestR0$(VBOXW32GUEST_SUFF_LIB)
    4546
    46 include $(PATH_KBUILD)/footer.kmk
     47include $(PATH_KBUILD)/subfooter.kmk
    4748

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the VirtualBox Windows guest mirror video driver.
     3# Sub-Makefile for the VirtualBox Windows guest mirror video driver.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../../../..
     23SUB_DEPTH = ../../../../
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 SYSMODS = vrdpvd
    26 
     26SYSMODS += vrdpvd
    2727vrdpvd_TEMPLATE    = VBOXW32GUESTR0
    2828vrdpvd_SDKS        = W2K3DDKX86
    … …  
    4141        $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)
    4242
    43 include $(PATH_KBUILD)/footer.kmk
     43include $(PATH_KBUILD)/subfooter.kmk
    4444

  • trunk/src/VBox/Additions/WINNT/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the Windows NT++ Guest Additions.
     3# Sub-Makefile for the Windows NT++ Guest Additions.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../..
     23SUB_DEPTH = ..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 SUBDIRS = \
    26         Graphics \
    27         i8042prt \
    28         MouseFilter \
    29         VBoxGuest \
    30         VBoxService \
    31         VBoxGINA \
    32         VBoxControl
     26# Include Sub-Makefiles.
     27include $(PATH_SUB_CURRENT)/Graphics/Makefile.kmk
     28include $(PATH_SUB_CURRENT)/i8042prt/Makefile.kmk
     29include $(PATH_SUB_CURRENT)/MouseFilter/Makefile.kmk
     30include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
     31include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
     32include $(PATH_SUB_CURRENT)/VBoxGINA/Makefile.kmk
     33include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
    3334ifdef VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS
    34 SUBDIRS += \
    35         SharedFolders
     35include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
     36endif
     37ifneq ($(wildcard $(PATH_SUB_CURRENT)/Installer),)
     38include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk
    3639endif
    3740
    38 ifneq ($(wildcard Installer),)
    39 SUBDIRS += \
    40         Installer
    41 endif
     41include $(PATH_KBUILD)/subfooter.kmk
    4242
    43 include $(PATH_KBUILD)/footer.kmk
    44 

  • trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the VirtualBox Windows Guest mouse filter driver.
     3# Sub-Makefile for the VirtualBox Windows Guest mouse filter driver.
    44#
    55
    … …  
    2121#
    2222
    23 DEPTH = ../../../../..
    24 include $(PATH_KBUILD)/header.kmk
     23DEPTH ?= ../../../../..
     24SUB_DEPTH = ../..
     25include $(PATH_KBUILD)/subheader.kmk
    2526
    26 SYSMODS = VBoxMouse
    27 
     27SYSMODS += VBoxMouse
    2828VBoxMouse_TEMPLATE    = VBOXW32GUESTR0
    2929VBoxMouse_DEFS        = LOG_TO_BACKDOOR
    3030#VBoxMouse_DEFS       += LOG_ENABLED
    3131VBoxMouse_SDKS        = W2K3DDKX86 WINPSDKINCS
     32VBoxMouse_CXXFLAGS    = -Od
     33VBoxMouse_CFLAGS      = -Od
    3234VBoxMouse_LDFLAGS     = -Entry:DriverEntry@8
    3335VBoxMouse_SOURCES     = VBoxMouse.cpp
    … …  
    4042        $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)
    4143
    42 VBoxMouse_CXXFLAGS = -Od
    43 VBoxMouse_CFLAGS   = -Od
     44include $(PATH_KBUILD)/subfooter.kmk
    4445
    45 include $(PATH_KBUILD)/footer.kmk
    46 

  • trunk/src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for VBoxControl.
     3# Sub-Makefile for VBoxControl.
    44#
    55
    … …  
    2121#
    2222
    23 DEPTH = ../../../../..
    24 include $(PATH_KBUILD)/header.kmk
     23DEPTH ?= ../../../../..
     24SUB_DEPTH = ../..
     25include $(PATH_KBUILD)/subheader.kmk
    2526
    26 PROGRAMS = VBoxControl
    27 
     27PROGRAMS += VBoxControl
    2828VBoxControl_TEMPLATE = VBOXW32GUESTR3
    2929VBoxControl_SOURCES  = \
    … …  
    3131        VBoxControl.rc
    3232
    33 include $(PATH_KBUILD)/footer.kmk
     33include $(PATH_KBUILD)/subfooter.kmk
    3434

  • trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for VBoxGINA.
     3# Sub-Makefile for VBoxGINA.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../..
     23SUB_DEPTH ?= ../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 DLLS = VBoxGINA
    26 
     26DLLS += VBoxGINA
    2727VBoxGINA_TEMPLATE = VBOXW32GUESTR3
    2828VBoxGINA_DEFS     = UNICODE
    … …  
    3535        $(PATH_LIB)/additions/RuntimeW32GuestR3$(VBOXW32GUEST_SUFF_LIB)
    3636
    37 include $(PATH_KBUILD)/footer.kmk
     37include $(PATH_KBUILD)/subfooter.kmk
    3838

  • trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for VBoxGuest (Windows Guest Additions Driver).
     3# Sub-Makefile for VBoxGuest (Windows Guest Additions Driver).
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../..
    23 include $(PATH_KBUILD)/header.kmk
    24 
    25 SYSMODS = VBoxGuest VBoxGuestNT
    26 #PROGRAMS = VBoxGuestInst
     22DEPTH ?= ../../../../..
     23SUB_DEPTH = ../..
     24include $(PATH_KBUILD)/subheader.kmk
    2725
    2826#
    2927# VBoxGuest
    3028#
     29SYSMODS += VBoxGuest
    3130VBoxGuest_TEMPLATE    = VBOXW32GUESTR0
    3231VBoxGuest_SDKS        = W2K3DDKX86 WINPSDKINCS
    … …  
    4746        $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)
    4847
     48
    4949#
    5050# VBoxGuestNT - NT version of the driver.
    5151#
     52SYSMODS += VBoxGuestNT
    5253VBoxGuestNT_TEMPLATE  = VBOXW32GUESTR0
    5354VBoxGuestNT_SDKS      = W2K3DDKX86 WINPSDKINCS
    … …  
    6970#       $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib  - not needed?
    7071
     72
    7173#
    7274# VBoxGuestInst - The installer.
    7375#
     76#PROGRAMS += VBoxGuestInst
    7477VBoxGuestInst_TEMPLATE= VBOXW32GUESTR3
    7578VBoxGuestInst_SOURCES = VBoxGuestInst.cpp
    7679
    77 include $(PATH_KBUILD)/footer.kmk
     80include $(PATH_KBUILD)/subfooter.kmk
    7881

  • trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for VBoxService.
     3# Sub-Makefile for VBoxService.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../..
     23SUB_DEPTH = ../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 PROGRAMS = VBoxService
    26 
     26PROGRAMS += VBoxService
    2727VBoxService_TEMPLATE = VBOXW32GUESTR3
    2828VBoxService_DEFS     = VBOX_HGCM
    … …  
    3434        $(PATH_LIB)/additions/RuntimeW32GuestR3.lib
    3535
    36 include $(PATH_KBUILD)/footer.kmk
     36include $(PATH_KBUILD)/subfooter.kmk
    3737

  • trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the VirtualBox NT4 guest additions mouse driver.
     3# Sub-Makefile for the VirtualBox NT4 guest additions mouse driver.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../..
     23SUB_DEPTH = ../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    25 SYSMODS = VBoxMouseNT
    26 OTHER_CLEAN   = \
    27         $(PATH_VBoxMouseNT)/i8042log.dbg \
    28         $(PATH_VBoxMouseNT)/i8042log.h \
    29         $(PATH_VBoxMouseNT)/i8042log.rc \
    30         $(PATH_VBoxMouseNT)/MSG00001.bin
    3126
     27SYSMODS += VBoxMouseNT
    3228VBoxMouseNT_TEMPLATE    = VBOXW32GUESTR0
    3329VBoxMouseNT_SDKS        = W2K3DDKX86 WINPSDKINCS
    … …  
    5753VBoxMouseNT_DEPS        = \
    5854        $(PATH_VBoxMouseNT)/i8042log.rc
     55VBoxMouseNT_CLEAN       = \
     56        $(PATH_VBoxMouseNT)/i8042log.dbg \
     57        $(PATH_VBoxMouseNT)/i8042log.h \
     58        $(PATH_VBoxMouseNT)/i8042log.rc \
     59        $(PATH_VBoxMouseNT)/MSG00001.bin
    5960
    6061
    61 include $(PATH_KBUILD)/footer.kmk
     62include $(PATH_KBUILD)/subfooter.kmk
    6263
    6364
    64 $(PATH_VBoxMouseNT)/i8042log.rc: i8042log.mc | $(call DIRDEP,$(PATH_VBoxMouseNT))
     65$(PATH_VBoxMouseNT)/i8042log.rc: $(VBoxMouseNT_PATH)/i8042log.mc | $(call DIRDEP,$(PATH_VBoxMouseNT))
    6566        $(call MSG_COMPILE,VBoxMouseNT,$<,$@,RC)
    6667        $(QUIET)$(WIN32_MC) \

  • trunk/src/VBox/Additions/common/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the common addition code.
     3# Sub-Makefile for the common addition code.
    44#
    55
    … …  
    2020#
    2121
    22 SUBDIRS = VBoxGuestLib
     22DEPTH ?= ../../../..
     23SUB_DEPTH = ..
     24include $(PATH_KBUILD)/subheader.kmk
    2325
    24 DEPTH = ../../../..
    25 include $(PATH_KBUILD)/rules.kmk
     26# Include sub-makefile.
     27include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
    2628
     29include $(PATH_KBUILD)/subfooter.kmk
     30

  • trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

    r2478 r2487  
    11# $Id$
    22## @file
    3 # Makefile for the common guest addition code library.
     3# Sub-Makefile for the common guest addition code library.
    44#
    55
    … …  
    2020#
    2121
    22 DEPTH = ../../../../..
    23 include $(PATH_KBUILD)/header.kmk
     22DEPTH ?= ../../../../..
     23SUB_DEPTH = ../..
     24include $(PATH_KBUILD)/subheader.kmk
    2425
    2526# As we build Windows Additions on Linux as well, we need a
    … …  
    6566        $(PATH_VBoxGuestLib)
    6667VBoxGuestLib_INCS.win    = \
    67         ../../WINNT/SharedFolders/include
     68        $(PATH_SUB_ROOT)/WINNT/SharedFolders/include
    6869VBoxGuestLib_DEFS = IN_RING0 IN_RT_R0 VBOX_HGCM LOG_TO_BACKDOOR
    6970#VBoxGuestLib_DEFS += LOG_ENABLED
    … …  
    101102
    102103
    103 include $(PATH_KBUILD)/footer.kmk
     104include $(PATH_KBUILD)/subfooter.kmk
    104105
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