VirtualBox

Changeset 34609 in vbox


Ignore:
Timestamp:
Dec 2, 2010 2:04:24 PM (14 years ago)
Author:
vboxsync
Message:

*.kmk: Removed all references to VBOX_SINGLE_MAKEFILE and all the associated ifndef sections.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r34595 r34609  
    226226# exist and which value they should have (usually 1, but anyway).
    227227#
    228 
    229 # Virtual single makefile.
    230 # If undefined, the tranditional recursive make method will be used.
    231 VBOX_SINGLE_MAKEFILE = 1
    232228
    233229## @name Additions

  • trunk/Makefile.kmk

    r34517 r34609  
    2222# Sub-makefiles / Sub-directories.
    2323#
    24 ifdef VBOX_SINGLE_MAKEFILE
    25  if defined(VBOX_WITH_DOCS) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_TESTSUITE)
    26   include $(PATH_SUB_CURRENT)/doc/manual/Makefile.kmk
    27  endif
    28  include $(PATH_SUB_CURRENT)/src/Makefile.kmk
    29 else
    30  if defined(VBOX_WITH_DOCS) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_TESTSUITE)
    31   SUBDIRS = doc/manual
    32  endif
    33  SUBDIRS += src
    34 endif
     24if defined(VBOX_WITH_DOCS) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_TESTSUITE)
     25 include $(PATH_SUB_CURRENT)/doc/manual/Makefile.kmk
     26endif
     27include $(PATH_SUB_CURRENT)/src/Makefile.kmk
    3528
    3629
    … …  
    262255        $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(PATH_TARGET)/VBoxGuestAdditions.iso.tmp
    263256 else
    264         $(KMK) --affinity 1 -f $(MAKEFILE) VBOX_SINGLE_MAKEFILE= buildserver-additions-affinity-hack
     257        $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-additions-affinity-hack
    265258 endif
    266259        $(CP) -f $(PATH_TARGET)/VBoxGuestAdditions.iso.tmp $(PATH_TARGET)/VBoxGuestAdditions.iso
    … …  
    310303        $(SHELL) $(PATH_DEVTOOLS)/bin/documentation.sh --cmd fetch --filename [email protected]
    311304 else
    312         $(KMK) --affinity 1 -f $(MAKEFILE) VBOX_SINGLE_MAKEFILE= buildserver-documentation-affinity-hack
     305        $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-documentation-affinity-hack
    313306 endif
    314307        $(CP) -f [email protected] $@
    … …  
    362355        $(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename [email protected]
    363356   else
    364         $(KMK) --affinity 1 -f $(MAKEFILE) VBOX_SINGLE_MAKEFILE= buildserver-efifw-affinity-hack
     357        $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-efifw-affinity-hack
    365358   endif
    366359        $(CP) -f [email protected] $@
    … …  
    428421# (This should be converted into a separate pass or merged with an existing one later.)
    429422#
    430  ifdef VBOX_SINGLE_MAKEFILE
    431   ifdef VBOX_WITH_ALL_DOXYGEN_TARGETS
     423 ifdef VBOX_WITH_ALL_DOXYGEN_TARGETS
    432424docs: docs.Core
    433   endif
    434  else  # !VBOX_SINGLE_MAKEFILE
    435 docs: $(if $(VBOX_WITH_ALL_DOXYGEN_TARGETS),docs.Core)
    436         $(KMK) -C src/VBox/Main    docs.Main
    437   ifdef VBOX_WITH_ALL_DOXYGEN_TARGETS
    438         $(KMK) -C src/VBox/Runtime docs.iprt
    439   endif
    440  endif # !VBOX_SINGLE_MAKEFILE
     425 endif
    441426endif # !VBOX_ONLY_DOCS
    442427

  • trunk/doc/VBox-MakefileGuidelines.cpp

    r28800 r34609  
    7878 *      - Using bits defined by a sub-makefile is fine, using anything defined
    7979 *        by a parent, sibling, uncle, cousine, or remoter relatives is not
    80  *        Okay. It may break sub-tree building and possibly also
    81  *        VBOX_SINGLE_MAKEFILE, both things that has to work all the time.
    82  *
    83  *      - The traditional recursive build must always work, i.e. undefine
    84  *        VBOX_SINGLE_MAKEFILE.
     80 *        Okay. It may break sub-tree building which is not acceptable.
    8581 *
    8682 *      - Template names starts with VBOX and are all upper cased, no

  • trunk/src/Makefile.kmk

    r34492 r34609  
    1818SUB_DEPTH = ..
    1919include $(KBUILD_PATH)/subheader.kmk
    20 
    21 ifdef VBOX_SINGLE_MAKEFILE
    2220
    2321if defined(VBOX_ONLY_ADDITIONS)
    … …  
    5755endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_DOCS && !VBOX_ONLY_SDK && !VBOX_ONLY_TESTSUITE
    5856
    59 else  # !VBOX_SINGLE_MAKEFILE
    60 DEPTH  = ..
    61 include $(KBUILD_PATH)/header.kmk
    62 
    63 ifdef VBOX_ONLY_ADDITIONS
    64  SUBDIRS = VBox
    65 
    66 else ifdef VBOX_ONLY_DOCS
    67  SUBDIRS = VBox/Runtime bldprogs libs VBox
    68 
    69 else ifdef VBOX_ONLY_SDK
    70  SUBDIRS = bldprogs libs VBox
    71 
    72 else  # !VBOX_ONLY_ADDITIONS
    73  # Build IPRT first because xpcom (IPC, nspr, python) depends on it.
    74  SUBDIRS = libs VBox/Runtime bldprogs VBox recompiler
    75  ifneq ($(wildcard apps),)
    76   SUBDIRS += apps
    77  endif
    78  ifdef VBOX_WITH_TESTSUITE
    79   SUBDIRS += tests
    80  endif
    81  ifdef VBOX_WITH_TESTCASES
    82   SUBDIRS += testcase
    83  endif
    84 endif # !VBOX_ONLY_ADDITIONS
    85 
    86 endif # !VBOX_SINGLE_MAKEFILE
    87 
    8857include $(KBUILD_PATH)/subfooter.kmk
    8958

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

    r34607 r34609  
    502502#
    503503# We can't just built up OTHERS and append it to OTHER_CLEAN because we're sharing
    504 # OTHERS with all the other VBox makefiles (VBOX_SINGLE_MAKEFILE), thus VBOXWEB_OTHERS.
     504# OTHERS with all the other VBox makefiles, thus VBOXWEB_OTHERS.
    505505#
    506506OTHERS += $(VBOXWEB_OTHERS)

  • trunk/src/VBox/Makefile.kmk

    r34492 r34609  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
    21 ifdef VBOX_SINGLE_MAKEFILE
    2221
    2322ifdef VBOX_ONLY_ADDITIONS
    … …  
    10099endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
    101100
    102 else # !VBOX_SINGLE_MAKEFILE
    103 
    104 ifdef VBOX_ONLY_ADDITIONS
    105  SUBDIRS = Runtime
    106  ifdef VBOX_WITH_CROGL
    107   SUBDIRS += GuestHost
    108  endif
    109  SUBDIRS += Additions
    110 
    111 else ifdef VBOX_ONLY_DOCS
    112  SUBDIRS = \
    113         Runtime \
    114         Frontends \
    115         HostDrivers
    116 
    117 else ifdef VBOX_ONLY_SDK
    118   SUBDIRS = \
    119         Main \
    120         RDP \
    121         Installer
    122 
    123 else  # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
    124  SUBDIRS_BLDPROGS = Devices Main
    125 
    126  SUBDIRS = \
    127         Runtime \
    128         HostDrivers \
    129         VMM \
    130         Devices \
    131         Disassembler \
    132         Storage
    133 
    134  ifdef VBOX_WITH_CROGL
    135   SUBDIRS += GuestHost
    136  endif
    137 
    138  SUBDIRS += HostServices
    139 
    140  ifdef VBOX_WITH_DEBUGGER
    141   SUBDIRS += Debugger
    142  endif
    143 
    144  ifdef VBOX_WITH_MAIN
    145   SUBDIRS += Main
    146  endif
    147 
    148  ifdef VBOX_WITH_VRDP
    149   SUBDIRS += RDP
    150  endif
    151 
    152  ifdef VBOX_WITH_ADDITIONS
    153   SUBDIRS += Additions
    154  endif
    155 
    156  ifdef VBOX_WITH_TESTSUITE
    157   SUBDIRS += Testsuite
    158  endif
    159 
    160  SUBDIRS += \
    161         Frontends \
    162         NetworkServices
    163 
    164  ifndef VBOX_OSE
    165   SUBDIRS += ExtPacks
    166  endif
    167 
    168  # This must be the last one.
    169  ifdef VBOX_WITH_INSTALLER
    170   SUBDIRS += Installer
    171  endif
    172 endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
    173 
    174 endif # !VBOX_SINGLE_MAKEFILE
    175101
    176102include $(KBUILD_PATH)/subfooter.kmk
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