VirtualBox

Changeset 6759 in vbox


Ignore:
Timestamp:
Feb 2, 2008 9:44:51 AM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
27841
Message:

Converted all but VirtualBox/Makefile.kmk to sub-makefiles.

Location:
trunk/src/VBox/Frontends
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r5999 r6759  
    11# $Id$
    22## @file
    3 # Makefile for the VBox frontend base directory.
     3# Top-level makefile for the VBox frontends.
    44#
    55
    … …  
    1717
    1818DEPTH = ../../..
    19 include $(PATH_KBUILD)/header.kmk
     19include $(PATH_KBUILD)/subheader.kmk
    2020
     21# Include Sub-Makefiles
    2122ifdef VBOX_WITH_MAIN
    22 SUBDIRS += VBoxManage
     23 include $(PATH_SUB_CURRENT)/VBoxManage/Makefile.kmk
    2324endif
    2425ifdef VBOX_WITH_VBOXSDL
    25 SUBDIRS += VBoxSDL
    26 endif
    27 ifdef VBOX_WITH_QTGUI
    28 SUBDIRS += VirtualBox
     26 include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
    2927endif
    3028ifdef VBOX_WITH_VBOXBFE
    31 SUBDIRS += VBoxBFE
     29 include $(PATH_SUB_CURRENT)/VBoxBFE/Makefile.kmk
    3230endif
    3331ifdef VBOX_WITH_VBOXFB
    34 SUBDIRS += VBoxFB
     32 include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk
    3533endif
    3634ifdef VBOX_WITH_VRDP
    37 SUBDIRS += VBoxVRDP
     35 include $(PATH_SUB_CURRENT)/VBoxVRDP/Makefile.kmk
    3836endif
    3937ifdef VBOX_WITH_HEADLESS
    40 SUBDIRS += VBoxHeadless
     38 include $(PATH_SUB_CURRENT)/VBoxHeadless/Makefile.kmk
    4139endif
    4240
    43 include $(PATH_KBUILD)/footer.kmk
     41# Sub-directory walk (qt is too much work for now)
     42ifdef VBOX_WITH_QTGUI
     43SUBDIRS_AFTER += VirtualBox
     44endif
    4445
     46include $(PATH_KBUILD)/subfooter.kmk
     47

  • trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

    r5999 r6759  
    11# $Id$
    22## @file
    3 # Makefile for VBoxBFE (a basic frontend which doesn't make use of Main).
     3# Sub-Makefile for VBoxBFE (a basic frontend which doesn't make use of Main).
    44#
    55
    … …  
    1616#
    1717
    18 DEPTH = ../../../..
    19 include $(PATH_KBUILD)/header.kmk
     18DEPTH ?= ../../../..
     19SUB_DEPTH = ..
     20include $(PATH_KBUILD)/subheader.kmk
    2021
    21 PROGRAMS = VBoxBFE
     22PROGRAMS += VBoxBFE
    2223
    2324#
    … …  
    9798VBoxBFE_INCS = \
    9899        $(PATH_VBoxBFE) \
    99         $(PATH_BIN)/sdk/include
     100        $(VBOX_PATH_SDK)/include
    100101ifneq ($(filter-out win os2 l4 darwin,$(BUILD_TARGET)),) # X11
    101102VBoxBFE_INCS += \
    … …  
    145146
    146147
    147 include $(PATH_KBUILD)/footer.kmk
     148include $(PATH_KBUILD)/subfooter.kmk
    148149
    149150# Convert the pnm-file to a byte array.
    150 $(PATH_VBoxBFE)/Ico64x01.h: ico64x01.pnm $(VBOX_BIN2C) | $(call DIRDEP,$(PATH_VBoxBFE))
     151$(PATH_VBoxBFE)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $(call DIRDEP,$(PATH_VBoxBFE))
    151152        $(call MSG_TOOL,bin2c,VBoxBFE,$<,$@)
    152153        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@

  • trunk/src/VBox/Frontends/VBoxFB/Makefile.kmk

    r5999 r6759  
    11# $Id$
    22## @file
    3 # Makefile for VBoxFB.
     3# Sub-Makefile for VBoxFB.
    44#
    55
    … …  
    1616#
    1717
    18 DEPTH = ../../../..
    19 include $(PATH_KBUILD)/header.kmk
     18DEPTH ?= ../../../..
     19SUB_DEPTH = ..
     20include $(PATH_KBUILD)/subheader.kmk
    2021
    21 PROGRAMS = VBoxFB
     22PROGRAMS += VBoxFB
    2223
    2324VBoxFB_SOURCES    = \
    … …  
    2829VBoxFB_INCS       = \
    2930        /usr/include/directfb \
    30         $(PATH_BIN)/sdk/include \
     31        $(VBOX_PATH_SDK)/include \
    3132        $(VBOX_XPCOM_INCS)
    3233VBoxFB_LIBS       = \
    … …  
    4546        -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar -pthread -pipe
    4647
    47 include $(PATH_KBUILD)/footer.kmk
     48include $(PATH_KBUILD)/subfooter.kmk
    4849

  • trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

    r6000 r6759  
    11# $Id$
    22## @file
    3 # Makefile for the headless frontend.
     3# Sub-Makefile for the headless frontend.
    44#
    55
    … …  
    1616#
    1717
    18 DEPTH = ../../../..
    19 include $(PATH_KBUILD)/header.kmk
     18DEPTH ?= ../../../..
     19SUB_DEPTH = ..
     20include $(PATH_KBUILD)/subheader.kmk
    2021
    21 PROGRAMS                = VBoxHeadless
    22 SUBDIRS_AFTER           = testcase
     22PROGRAMS += VBoxHeadless
     23include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
     24ifdef VBOX_WITH_FFMPEG
     25 include $(PATH_SUB_CURRENT)/VideoCapture/Makefile.kmk
     26endif
    2327
    2428VBoxHeadless_TEMPLATE   = VBOXMAINCLIENTEXE
     29VBoxHeadless_DEFS       = VBOX_FFMPEG
    2530VBoxHeadless_SOURCES    = VBoxHeadless.cpp
    26 VBoxHeadless_DEFS       = VBOX_FFMPEG
    27 
    2831ifdef VBOX_WITH_VRDP
    29 VBoxHeadless_SOURCES   += Framebuffer.cpp
    30 VBoxHeadless_DEFS      += VBOX_WITH_VRDP
     32 VBoxHeadless_DEFS     += VBOX_WITH_VRDP
     33 VBoxHeadless_SOURCES  += Framebuffer.cpp
    3134endif
    3235
    33 ifdef VBOX_WITH_FFMPEG
    34  SUBDIRS += VideoCapture
    35 endif
     36include $(PATH_KBUILD)/subfooter.kmk
    3637
    37 include $(PATH_KBUILD)/footer.kmk
    38 

  • trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk

    r6000 r6759  
    11# $Id$
    22## @file
    3 # Makefile for the ffmpeg frame buffer module.
     3# Sub-Makefile for the ffmpeg frame buffer module.
    44#
    55
    … …  
    1616#
    1717
    18 DEPTH = ../../../../..
    19 include $(PATH_KBUILD)/header.kmk
     18DEPTH ?= ../../../../..
     19SUB_DEPTH = ../..
     20include $(PATH_KBUILD)/subheader.kmk
    2021
    21 DLLS                         = VBoxFFmpegFB
     22DLLS += VBoxFFmpegFB
    2223VBoxFFmpegFB_TEMPLATE        = VBOXMAINCLIENTDLL
    2324VBoxFFmpegFB_SDKS            = VBOX_FFMPEG VBOX_LIBPNG VBOX_ZLIB
    … …  
    2526VBoxFFmpegFB_CXXFLAGS.linux += -fPIC
    2627
    27 include $(PATH_KBUILD)/footer.kmk
     28include $(PATH_KBUILD)/subfooter.kmk
    2829

  • trunk/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk

    r6000 r6759  
    11# $Id$
    22## @file
    3 # Makefile for the VRDP (headless RDP server) frontend testcase.
     3# Sub-Makefile for the VRDP (headless RDP server) frontend testcase.
    44#
    55
    … …  
    1616#
    1717
    18 DEPTH = ../../../../..
    19 include $(PATH_KBUILD)/header.kmk
     18DEPTH ?= ../../../../..
     19SUB_DEPTH = ../..
     20include $(PATH_KBUILD)/subheader.kmk
    2021
    2122ifdef VBOX_WITH_TESTCASES
    22 PROGRAMS = tstHeadless
     23 PROGRAMS += tstHeadless2
    2324endif
    2425
    25 tstHeadless_TEMPLATE = VBOXMAINCLIENTEXE
    26 tstHeadless_SOURCES  = tstHeadless.cpp
     26tstHeadless2_TEMPLATE = VBOXMAINCLIENTEXE
     27tstHeadless2_SOURCES  = tstHeadless.cpp
    2728
    28 include $(PATH_KBUILD)/footer.kmk
     29include $(PATH_KBUILD)/subfooter.kmk
    2930

  • trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

    r6597 r6759  
    11# $Id$
    22## @file
    3 # Makefile for VBoxManage (the cli frontend).
     3# Sub-Makefile for VBoxManage (the cli frontend).
    44#
    55
    … …  
    1717
    1818
    19 DEPTH = ../../../..
    20 include $(PATH_KBUILD)/header.kmk
     19DEPTH ?= ../../../..
     20SUB_DEPTH = ..
     21include $(PATH_KBUILD)/subheader.kmk
    2122
    22 PROGRAMS = VBoxManage
    23 
    24 VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
    25 VBoxManage_SOURCES    = \
     23PROGRAMS += VBoxManage
     24VBoxManage_TEMPLATE    = VBOXMAINCLIENTEXE
     25VBoxManage_DEFS       += $(if $(VBOX_WITH_VRDP),VBOX_VRDP,) \
     26                         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
     27                         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,)
     28VBoxManage_SOURCES     = \
    2629        VBoxManage.cpp \
    2730        VBoxInternalManage.cpp \
    2831        VBoxManageSVN.cpp
    2932ifndef VBOX_OSE
    30 VBoxManage_SOURCES   += \
     33 VBoxManage_SOURCES   += \
    3134        VBoxInternalManageVmdk.cpp
    3235endif
    33 VBoxManage_DEFS      += $(if $(VBOX_WITH_VRDP),VBOX_VRDP,) \
    34                         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
    35                         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,)
    36 VBoxManage_LIBS      += $(LIB_DDU)
     36VBoxManage_LIBS       += $(LIB_DDU)
    3737
    3838# VBoxManageSVN.cpp uses VBOX_SVN_REV.
    … …  
    4040VBoxManageSVN.cpp_DEPS = $(VBOX_SVN_REV_KMK)
    4141
     42include $(PATH_KBUILD)/subfooter.kmk
    4243
    43 include $(PATH_KBUILD)/footer.kmk

  • trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

    r5999 r6759  
    11# $Id$
    22## @file
    3 # Makefile for VBoxSDL (a simple frontend based on SDL).
     3# Sub-Makefile for VBoxSDL (a simple frontend based on SDL).
    44#
    55
    … …  
    1616#
    1717
    18 DEPTH = ../../../..
    19 include $(PATH_KBUILD)/header.kmk
     18DEPTH ?= ../../../..
     19SUB_DEPTH = ..
     20include $(PATH_KBUILD)/subheader.kmk
    2021
    21 PROGRAMS = VBoxSDL tstSDL
     22PROGRAMS += VBoxSDL tstSDL
    2223
    2324
    … …  
    142143
    143144# generate rules
    144 include $(PATH_KBUILD)/footer.kmk
     145include $(PATH_KBUILD)/subfooter.kmk
    145146
    146147
    147148# Convert the pnm-file to a byte array.
    148 $(PATH_VBoxSDL)/Ico64x01.h: ico64x01.pnm $(VBOX_BIN2C) | $(call DIRDEP,$(PATH_VBoxSDL))
     149$(PATH_VBoxSDL)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $(call DIRDEP,$(PATH_VBoxSDL))
    149150        $(call MSG_TOOL,bin2c,VBoxSDL,$<,$@)
    150151        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
Note: See TracChangeset for help on using the changeset viewer.

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