VirtualBox

Changeset 11805 in vbox


Ignore:
Timestamp:
Aug 29, 2008 10:17:27 AM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
35632
Message:
  • rearranged SDK-only stuff in makefiles per Knut advise
Location:
trunk/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile.kmk

    r11703 r11805  
    5858else  # !VBOX_ONLY_ADDITIONS
    5959 # Build IPRT first because xpcom (IPC, nspr, python) depends on it.
    60  SUBDIRS = VBox/Runtime bldprogs libs VBox recompiler
    61  ifneq ($(wildcard apps),)
    62   SUBDIRS += apps
     60 ifndef VBOX_ONLY_SDK
     61  SUBDIRS = VBox/Runtime
    6362 endif
    64  ifdef VBOX_WITH_TESTSUITE
    65   SUBDIRS +=  tests
    66  endif
    67  ifdef VBOX_WITH_TESTCASES
    68   SUBDIRS +=  testcase
    69  endif
     63 SUBDIRS += bldprogs libs VBox
     64 ifndef VBOX_ONLY_SDK
     65  SUBDIRS += recompiler
     66  ifneq ($(wildcard apps),)
     67   SUBDIRS += apps
     68  endif
     69  ifdef VBOX_WITH_TESTSUITE
     70   SUBDIRS +=  tests
     71  endif
     72  ifdef VBOX_WITH_TESTCASES
     73   SUBDIRS +=  testcase
     74  endif
     75 endif #!VBOX_ONLY_SDK
    7076 ifdef VBOX_ONLY_DOCS
    7177  SUBDIRS := $(filter VBox/Runtime bldprogs libs VBox, $(SUBDIRS))

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

    r11750 r11805  
    2626endif
    2727include $(KBUILD_PATH)/subheader.kmk
    28 
    29 ifndef VBOX_ONLY_SDK
    3028
    3129# Include sub-makefiles.
    … …  
    904902endif
    905903
    906 endif # !VBOX_ONLY_SDK
    907 
    908904include $(KBUILD_PATH)/subfooter.kmk

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

    r11734 r11805  
    3232# validation testcases. Perhaps a bit hackish, but extremely useful.
    3333#
    34 ifndef VBOX_ONLY_SDK
    35  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    36   ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    37    OTHERS += \
     34ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
     35 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
     36  OTHERS += \
    3837        $(PATH_TARGET)/tstDeviceStructSize.run
    39   endif
    4038 endif
    4139endif

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

    r11721 r11805  
    2424
    2525# Include Sub-Makefiles
    26 ifndef VBOX_ONLY_SDK
    27  ifdef VBOX_WITH_MAIN
    28   include $(PATH_SUB_CURRENT)/VBoxManage/Makefile.kmk
     26ifdef VBOX_WITH_MAIN
     27 include $(PATH_SUB_CURRENT)/VBoxManage/Makefile.kmk
     28endif
     29ifndef VBOX_ONLY_DOCS
     30 ifdef VBOX_WITH_VBOXSDL
     31  include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
    2932 endif
    30  ifndef VBOX_ONLY_DOCS
    31   ifdef VBOX_WITH_VBOXSDL
    32    include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
     33 ifdef VBOX_WITH_VBOXBFE
     34  include $(PATH_SUB_CURRENT)/VBoxBFE/Makefile.kmk
     35 endif
     36 ifdef VBOX_WITH_VBOXFB
     37  include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk
     38 endif
     39 ifdef VBOX_WITH_HEADLESS
     40  include $(PATH_SUB_CURRENT)/VBoxHeadless/Makefile.kmk
     41 endif
     42
     43 ifndef VBOX_KBUILD_HACKING # Have to convert these monsters if this is gonna make any sense at all... :-(
     44  # Sub-directory walk (qt is too much work for now)
     45  ifdef VBOX_WITH_QTGUI
     46   SUBDIRS_AFTER += VirtualBox
    3347  endif
    34   ifdef VBOX_WITH_VBOXBFE
    35    include $(PATH_SUB_CURRENT)/VBoxBFE/Makefile.kmk
     48  ifdef VBOX_WITH_QT4GUI
     49   SUBDIRS_AFTER += VirtualBox4
    3650  endif
    37   ifdef VBOX_WITH_VBOXFB
    38    include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk
    39   endif
    40   ifdef VBOX_WITH_HEADLESS
    41    include $(PATH_SUB_CURRENT)/VBoxHeadless/Makefile.kmk
    42   endif
    43 
    44   ifndef VBOX_KBUILD_HACKING # Have to convert these monsters if this is gonna make any sense at all... :-(
    45    # Sub-directory walk (qt is too much work for now)
    46    ifdef VBOX_WITH_QTGUI
    47     SUBDIRS_AFTER += VirtualBox
    48    endif
    49    ifdef VBOX_WITH_QT4GUI
    50     SUBDIRS_AFTER += VirtualBox4
    51    endif
    52   endif # !VBOX_KBUILD_HACKING
    53  endif # !VBOX_ONLY_DOCS
    54 endif # !VBOX_ONLY_SDK
     51 endif # !VBOX_KBUILD_HACKING
     52endif # !VBOX_ONLY_DOCS
    5553
    5654include $(KBUILD_PATH)/subfooter.kmk

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

    r11754 r11805  
    287287PROGRAMS += VirtualBox4
    288288endif
    289 ifndef VBOX_ONLY_SDK
    290  ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
    291   DLLS += VBoxKeyboard
    292   ## @todo convert to install target.
    293   OTHERS += $(PATH_BIN)/vboxkeyboard.tar.gz
    294   CLEAN += $(PATH_BIN)/vboxkeyboard.tar.gz
    295  endif
     289
     290ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
     291 DLLS += VBoxKeyboard
     292 ## @todo convert to install target.
     293 OTHERS += $(PATH_BIN)/vboxkeyboard.tar.gz
     294 CLEAN += $(PATH_BIN)/vboxkeyboard.tar.gz
    296295endif
    297296INSTALLS += VirtualBox4.nls

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

    r11721 r11805  
    2727include $(KBUILD_PATH)/subheader.kmk
    2828
    29 ifndef VBOX_ONLY_SDK
    30  # Include sub-makefiles.
    31  include $(PATH_SUB_CURRENT)/Support/Makefile.kmk
     29# Include sub-makefiles.
     30include $(PATH_SUB_CURRENT)/Support/Makefile.kmk
    3231
    33  ifndef VBOX_ONLY_DOCS
    34   ifeq ($(KBUILD_TARGET),win)
    35    include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk
     32ifndef VBOX_ONLY_DOCS
     33 ifeq ($(KBUILD_TARGET),win)
     34  include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk
     35 endif
     36 ifdef VBOX_WITH_USB
     37  include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
     38 endif
     39 if1of ($(KBUILD_TARGET), darwin solaris)
     40  ifndef VBOX_OSE
     41   include $(PATH_SUB_CURRENT)/VBoxNetFlt/Makefile.kmk
    3642  endif
    37   ifdef VBOX_WITH_USB
    38    include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
    39   endif
    40   if1of ($(KBUILD_TARGET), darwin solaris)
    41    ifndef VBOX_OSE
    42     include $(PATH_SUB_CURRENT)/VBoxNetFlt/Makefile.kmk
    43    endif
    44   endif
    45  endif # !VBOX_ONLY_DOCS
    46 endif # !VBOX_ONLY_SDK
     43 endif
     44endif # !VBOX_ONLY_DOCS
    4745
    4846# Let kBuild generate the rules.

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

    r11778 r11805  
    4242$(PATH_VBoxCOM):
    4343        $(QUIET)$(MKDIR) -p $@
     44$(PATH_BIN)/components/:
     45        $(MKDIR) -p $@
    4446endif #!VBOX_ONLY_SDK
    4547

  • trunk/src/VBox/Makefile.kmk

    r11703 r11805  
    7171        HostDrivers
    7272
     73else ifdef VBOX_ONLY_SDK
     74  SUBDIRS =        \
     75        Main       \
     76        RDP        \
     77        Installer
     78
    7379else  # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
    7480 SUBDIRS_BLDPROGS = Devices Main

  • trunk/src/VBox/RDP/client/Makefile.kmk

    r11721 r11805  
    2626# The rdesktop-vrdp program.
    2727#
    28 ifndef VBOX_ONLY_SDK
    29  PROGRAMS += rdesktop-vrdp
    30 endif
     28PROGRAMS += rdesktop-vrdp
    3129rdesktop-vrdp_TEMPLATE = VBOXR3NPEXE
    3230rdesktop-vrdp_SDKS = VBOX_OPENSSL

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

    r11725 r11805  
    5656 LIBRARIES += RuntimeR3
    5757 DLLS += VBoxRT
    58 
    59 else ifdef VBOX_ONLY_SDK
    60  # Nothing really
    6158
    6259else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS

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

    r11725 r11805  
    2626endif
    2727include $(KBUILD_PATH)/subheader.kmk
    28 
    29 ifndef VBOX_ONLY_SDK
    3028
    3129# Include sub-makefiles.
    … …  
    435433VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
    436434
    437 endif #!VBOX_ONLY_SDK
    438 
    439435include $(KBUILD_PATH)/subfooter.kmk
    440436

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

    r11734 r11805  
    5252# validation testcases. Perhaps a bit hackish, but extremely useful.
    5353#
    54 ifndef VBOX_ONLY_SDK
    55  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    56   ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    57    OTHERS += \
     54ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
     55 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
     56  OTHERS += \
    5857        $(PATH_TARGET)/tstAsmStructs.run \
    5958        $(PATH_TARGET)/tstVMStructSize.run
    60   endif
    6159 endif
    6260endif

  • trunk/src/apps/Makefile.kmk

    r11721 r11805  
    1414include $(KBUILD_PATH)/subheader.kmk
    1515
    16 ifndef VBOX_ONLY_SDK
    17  ifdef VBOX_WITH_KCHMVIEWER
    18   ifneq ($(wildcard $(PATH_SUB_CURRENT)/kchmviewer-4.3),)
    19    # subdirectory currently not possible because of _QT_MOCHDRS
    20    SUBDIRS_AFTER += kchmviewer-4.3
    21   endif
     16ifdef VBOX_WITH_KCHMVIEWER
     17 ifneq ($(wildcard $(PATH_SUB_CURRENT)/kchmviewer-4.3),)
     18  # subdirectory currently not possible because of _QT_MOCHDRS
     19  SUBDIRS_AFTER += kchmviewer-4.3
    2220 endif
    23  ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),)
    24   ifeq ($(KBUILD_TARGET),linux)
    25    include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk
    26   endif
     21endif
     22ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),)
     23 ifeq ($(KBUILD_TARGET),linux)
     24  include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk
    2725 endif
    28 endif # !VBOX_ONLY_SDK
     26endif
    2927
    3028include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/recompiler/Makefile.kmk

    r11725 r11805  
    3636SUB_DEPTH = ../..
    3737include $(KBUILD_PATH)/subheader.kmk
    38 
    39 ifndef VBOX_ONLY_SDK
    4038
    4139BLDPROGS             += dyngen
    … …  
    339337                $< > [email protected]
    340338        $(MV) -f [email protected] $@
    341 
    342 endif # !VBOX_ONLY_SDK
    343339
    344340include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/testcase/Makefile.kmk

    r11721 r11805  
    2323include $(KBUILD_PATH)/subheader.kmk
    2424
    25 ifndef VBOX_ONLY_SDK
    26  PROGRAMS += tstRunTestcases
    27 endif
     25PROGRAMS += tstRunTestcases
    2826
    2927tstRunTestcases_TEMPLATE = VBOXR3TSTEXE
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