VirtualBox

Changeset 11721

Show
Ignore:
Timestamp:
08/27/08 22:09:03 (3 months ago)
Author:
vboxsync
Message:

- completly divorced SDK and binary, use 'kmk sdk' to build SDK

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r11712 r11721  
    194194 $(error It is VBOX_ONLY_ADDITIONS=1 not VBOX_ADDITIONS_ONLY!) 
    195195endif 
     196 
     197# When build SDK-only, no need for additions 
     198ifdef VBOX_ONLY_SDK 
     199 VBOX_WITHOUT_ADDITIONS=1 
     200endif 
     201 
    196202# Don't create the additions ISO. 
    197203# (Used by the additions build server, don't invert it.) 

  • trunk/Makefile.kmk

    r11703 r11721  
    701701                $(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.iso 
    702702 
     703sdk: 
     704        + $(KMK) VBOX_ONLY_SDK=1 VBOX_WITH_PYTHON=1 VBOX_WITHOUT_ADDITIONS=1 \ 
     705              pass_bldprogs pass_others pass_installs pass_packing 
     706 
    703707 
    704708# 

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

    r11556 r11721  
    2626endif 
    2727include $(KBUILD_PATH)/subheader.kmk 
     28 
     29ifndef VBOX_ONLY_SDK 
    2830 
    2931# Include sub-makefiles. 
    …… 
    859861endif 
    860862 
     863endif # !VBOX_ONLY_SDK 
     864 
    861865include $(KBUILD_PATH)/subfooter.kmk 

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

    r11556 r11721  
    3232# validation testcases. Perhaps a bit hackish, but extremely useful. 
    3333# 
    34 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) 
    35  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) 
    36   OTHERS += \ 
     34ifndef 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 += \ 
    3738        $(PATH_TARGET)/tstDeviceStructSize.run 
     39  endif 
    3840 endif 
    3941endif 

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

    r10050 r11721  
    2727endif 
    2828include $(KBUILD_PATH)/subheader.kmk 
     29 
     30ifndef VBOX_ONLY_SDK 
    2931 
    3032# include the sub-makefile first. 
    …… 
    98100endif # VBOX_WITH_TESTCASES 
    99101 
     102endif #!VBOX_ONLY_SDK 
    100103 
    101104include $(KBUILD_PATH)/subfooter.kmk 

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

    r11703 r11721  
    2424 
    2525# Include Sub-Makefiles 
    26 ifdef VBOX_WITH_MAIN 
    27  include $(PATH_SUB_CURRENT)/VBoxManage/Makefile.kmk 
    28 endif 
    29 ifndef VBOX_ONLY_DOCS 
    30  ifdef VBOX_WITH_VBOXSDL 
    31   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk 
     26ifndef VBOX_ONLY_SDK 
     27 ifdef VBOX_WITH_MAIN 
     28  include $(PATH_SUB_CURRENT)/VBoxManage/Makefile.kmk 
    3229 endif 
    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 
     30 ifndef VBOX_ONLY_DOCS 
     31  ifdef VBOX_WITH_VBOXSDL 
     32   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk 
     33  endif 
     34  ifdef VBOX_WITH_VBOXBFE 
     35   include $(PATH_SUB_CURRENT)/VBoxBFE/Makefile.kmk 
     36  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 
    4243 
    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 
    47  endif 
    48  ifdef VBOX_WITH_QT4GUI 
    49  SUBDIRS_AFTER += VirtualBox4 
    50  endif 
    51  endif # !VBOX_KBUILD_HACKING 
    52 endif # !VBOX_ONLY_DOCS 
     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 
     54endif # !VBOX_ONLY_SDK 
    5355 
    5456include $(KBUILD_PATH)/subfooter.kmk 

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

    r11637 r11721  
    280280# 
    281281PROGRAMS += VirtualBox4 
    282 ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11 
    283  DLLS += VBoxKeyboard 
    284  ## @todo convert to install target. 
    285  OTHERS += $(PATH_BIN)/vboxkeyboard.tar.gz 
    286  CLEAN += $(PATH_BIN)/vboxkeyboard.tar.gz 
     282ifndef VBOX_ONLY_SDK 
     283 ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11 
     284  DLLS += VBoxKeyboard 
     285  ## @todo convert to install target. 
     286  OTHERS += $(PATH_BIN)/vboxkeyboard.tar.gz 
     287  CLEAN += $(PATH_BIN)/vboxkeyboard.tar.gz 
     288 endif 
    287289endif 
    288290INSTALLS += VirtualBox4.nls 

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

    r11703 r11721  
    2727include $(KBUILD_PATH)/subheader.kmk 
    2828 
    29 # Include sub-makefiles. 
    30 include $(PATH_SUB_CURRENT)/Support/Makefile.kmk 
    31 ifndef VBOX_ONLY_DOCS 
    32  ifeq ($(KBUILD_TARGET),win) 
    33   include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk 
    34  endif 
    35  ifdef VBOX_WITH_USB 
    36   include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk 
    37  endif 
    38  if1of ($(KBUILD_TARGET), darwin solaris) 
    39   ifndef VBOX_OSE 
    40    include $(PATH_SUB_CURRENT)/VBoxNetFlt/Makefile.kmk 
     29ifndef VBOX_ONLY_SDK 
     30 # Include sub-makefiles. 
     31 include $(PATH_SUB_CURRENT)/Support/Makefile.kmk 
     32 
     33 ifndef VBOX_ONLY_DOCS 
     34  ifeq ($(KBUILD_TARGET),win) 
     35   include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk 
    4136  endif 
    42  endif 
    43 endif # !VBOX_ONLY_DOCS 
     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 
     46endif # !VBOX_ONLY_SDK 
    4447 
    4548# Let kBuild generate the rules. 

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

    r10797 r11721  
    2828include $(KBUILD_PATH)/subheader.kmk 
    2929 
     30ifndef VBOX_ONLY_SDK 
     31 
    3032# Include sub-makefiles. 
    3133ifdef VBOX_WITH_SHARED_FOLDERS 
    …… 
    4648endif 
    4749 
     50endif #!VBOX_ONLY_SDK 
     51 
    4852include $(KBUILD_PATH)/subfooter.kmk 
    4953 

  • trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

    r10198 r11721  
    4949endif # VBOX_WITH_TESTCASES 
    5050 
    51 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) 
    52  if1of ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH), x86.x86 amd64.amd64 x86.amd64) 
    53    OTHERS += $(PATH_TARGET)/tstShflSizes.run 
     51ifndef VBOX_ONLY_SDK 
     52 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) 
     53  if1of ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH), x86.x86 amd64.amd64 x86.amd64) 
     54    OTHERS += $(PATH_TARGET)/tstShflSizes.run 
     55  endif 
    5456 endif 
    5557endif 
    56  
    5758 
    5859include $(KBUILD_PATH)/subfooter.kmk 

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r11610 r11721  
    3434PACKING       += $(PATH_BIN)/VirtualBox.tar.bz2 
    3535 
    36 ifdef VBOX_WITH_SEPARATE_SDK 
    37 PACKING       += $(PATH_BIN)/VirtualBox-SDK.zip 
    38 SDK_IN_SEPARATE=sdk 
    39 SDK_IN_NORMAL= 
    40 else 
    41 SDK_IN_SEPARATE= 
    42 SDK_IN_NORMAL=sdk 
     36ifdef VBOX_ONLY_SDK 
     37SDK_ZIP        = $(PATH_BIN)/VirtualBox-$(VBOX_VERSION_STRING)-SDK.zip 
     38PACKING        = $(SDK_ZIP) 
    4339endif 
    4440 
    …… 
    111107        VBoxAddIF.sh \ 
    112108        $(if $(VBOX_WITH_QT4GUI),VirtualBox.desktop,) \ 
    113         src \ 
    114         $(SDK_IN_NORMAL) 
     109        src  
    115110 
    116111# Qt4 GUI 
    …… 
    233228# .tar.bz2 for converting into .run 
    234229$(PATH_TARGET)/install/VirtualBox.tar.bz2: \ 
    235                 $(if $(VBOX_WITH_SEPARATE_SDK), $(PATH_BIN)/VirtualBox-SDK.zip) \ 
     230                $(SDK_ZIP) \ 
    236231                $(addprefix $(PATH_TARGET)/archive/, $(LINUXARCHFILES)) \ 
    237232                Makefile.kmk \ 
    …… 
    256251 
    257252 
     253ifneq ($(SDK_ZIP),) 
    258254# make separate VirtualBox SDK delivery 
    259 $(PATH_BIN)/VirtualBox-SDK.zip:            \ 
    260                 $(PATH_TARGET)/archive/sdk \ 
    261                 $(VBOX_VERSION_STAMP)      \ 
    262                 $(PATH_TARGET)/VirtualBox-$(VBOX_VERSION_STRING) 
    263         $(call MSG_L1,Making separate SDK delivery $@) 
    264         $(QUIET)$(REDIRECT) -C $(PATH_TARGET)/archive -- zip -r9 $@ sdk 
    265         $(QUIET)$(RM) -Rf -- $(PATH_TARGET)/archive/sdk 
     255$(SDK_ZIP):    \ 
     256                $(PATH_BIN)/sdk \ 
     257                $(VBOX_VERSION_STAMP) 
     258        $(call MSG_L1,Making SDK delivery $@) 
     259        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip -r9 $@ sdk 
     260endif 
    266261 
    267262$(PATH_TARGET)/VirtualBox-$(VBOX_VERSION_STRING): $(PATH_TARGET)/archive 
    …… 
    300295        $(QUIET)$(if $(VBOX_DO_STRIP),objcopy --strip-unneeded -R .comment $< $@,cp $< $@) 
    301296 
    302 $(foreach f,$(LINUXNOSTRIP) $(SDK_IN_SEPARATE),$(PATH_TARGET)/archive/$(f)): \ 
     297$(foreach f,$(LINUXNOSTRIP),$(PATH_TARGET)/archive/$(f)): \ 
    303298                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% | $(call DIRDEP,$(PATH_TARGET)/archive) 
    304299        $(call MSG_INST_SYM,$<,$@) 

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r11657 r11721  
    3131SOLARIS_DBG_DIR  := $(PATH_TARGET)/installdbg 
    3232SOLARIS_VBI_DIR  := $(PATH_TARGET)/installvbi 
    33 SOLARIS_SDK_DIR  := $(PATH_TARGET)/installsdk 
    3433SOL_DBG_OBJCOPY  := $(CP) -p    # Solaris ld/gobjcopy(2.15) don't get along on x86, works only on amd64. So just using cp for now. 
    3534SOL_OBJCOPY      := /usr/sfw/bin/gobjcopy --strip-unneeded -R .comment 
    …… 
    5251        vbox.pkginfo vbox.copyright vbox.space vbox.pkgresponse \ 
    5352        makepackage.sh prototype postinstall.sh preremove.sh etc/devlink.tab ) 
    54  
    55 ifdef VBOX_WITH_SEPARATE_SDK 
    56 PACKING       += $(PATH_BIN)/VirtualBox-SDK.zip 
    57 endif 
    58  
    5953 
    6054# 
    …… 
    149143                $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.txt),\ 
    150144          nls/VirtualBox_$(f).qm nls/qt_$(f).qm),) 
    151  
    152 SOLARIS_SDK = \ 
    153         $(foreach f, $(shell $(CAT_EXT) $(if $(VBOX_OSE),sdkfiles.ose,sdkfiles)), $(f)) 
    154145 
    155146ifdef VBOX_WITH_DOCS 
    …… 
    360351        $(QUIET)$(RM) -Rf $(SOLARIS_INST_DIR) 
    361352 
    362 $(PATH_BIN)/VirtualBox-SDK.zip: \ 
    363                 $(VBOX_VERSION_STAMP) \ 
    364                 $(addprefix $(SOLARIS_SDK_DIR)/,$(SOLARIS_SDK)) 
    365         $(call MSG_L1,Making separate SDK delivery $@) 
    366         $(QUIET)$(REDIRECT) -C $(SOLARIS_SDK_DIR) -- zip -r9y $@ $(SOLARIS_SDK) 
    367         $(QUIET)$(RM) -Rf $(SOLARIS_SDK_DIR) 
    368      
    369353$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg: \ 
    370354                $(VBOX_VERSION_STAMP) \ 
    …… 
    434418        $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_BIN)/$(DBG_ARCHIVE) -C $(SOLARIS_DBG_DIR) $(SOLARIS_STRIP_BINS) 
    435419        $(QUIET)chmod 0644 $(PATH_BIN)/$(DBG_ARCHIVE) 
    436  
    437 $(addprefix $(SOLARIS_SDK_DIR)/,$(SOLARIS_SDK)): $$(subst $$(SOLARIS_SDK_DIR)/,$(PATH_BIN)/,$$@) 
    438         $(call MSG_L1,Copying $@) 
    439         $(QUIET)$(MKDIR) -p $(@D) 
    440         $(QUIET)$(CP) -pf $< $@ 
    441  
    442 # Enable this for forceful incremental re-packaging. Disabled as it's not needed. 
    443 #.PHONY: $(addprefix $(SOLARIS_INST_DIR)/,$(SOLARIS_SDK)) 
    444 #       $(RM) -Rf $(SOLARISINSTDIR) 
    445  

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

    r11638 r11721  
    3434 
    3535# targets++ 
    36 LIBRARIES       += VBoxCOM 
    37 DLLS            += VBoxSettings VBoxC 
    38 PROGRAMS        += VBoxSVC 
     36ifndef VBOX_ONLY_SDK 
     37 LIBRARIES       += VBoxCOM 
     38 DLLS            += VBoxSettings VBoxC 
     39 PROGRAMS        += VBoxSVC 
     40endif #!VBOX_ONLY_SDK 
     41 
    3942OTHERS           += $(VBOX_PATH_SDK)/bindings/VirtualBox.xidl 
    4043VBOX_MAIN_DEFS   = 
    …… 
    4346  $(error "VBox: VBOX_WITH_XPCOM isn't defined") 
    4447 endif 
    45  DLLS           += VBoxSVCM 
     48 ifndef VBOX_ONLY_SDK 
     49  DLLS           += VBoxSVCM 
     50 endif 
    4651 ifneq ($(KBUILD_TARGET),os2) 
    4752  VBOX_MAIN_DEFS+= VBOX_WITH_SYS_V_IPC_SESSION_WATCHER 
    …… 
    8085 BLDDIRS += $(VBOX_PATH_SDK)/bindings/mscom/idl 
    8186else # xpcom 
    82  INSTALLS       += xpcom-components 
     87 ifndef VBOX_ONLY_SDK 
     88  INSTALLS       += xpcom-components 
     89 endif #!VBOX_ONLY_SDK 
    8390 IDLFILE         = $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl 
    8491 ifeq ($(KBUILD_TARGET),linux) 

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

    r11620 r11721  
    2828include $(KBUILD_PATH)/subheader.kmk 
    2929 
    30 ifdef VBOX_WITH_TESTCASES 
    31  PROGRAMS       += tstAPI 
    32  PROGRAMS.linux += tstVBoxAPILinux 
    33  # That testcase is actually not linux specific, it's generic XPCOM. 
    34  PROGRAMS.solaris += tstVBoxAPILinux 
    35  PROGRAMS.win   += tstVBoxAPIWin 
    36 ifdef VBOX_WITH_RESOURCE_USAGE_API 
    37  PROGRAMS       += tstCollector 
    38 endif 
    39 else ifeq ($(USERNAME),dmik) 
    40  PROGRAMS       += tstAPI 
    41  PROGRAMS.linux += tstVBoxAPILinux 
    42  # That testcase is actually not linux specific, it's generic XPCOM. 
    43  PROGRAMS.solaris += tstVBoxAPILinux 
    44  PROGRAMS.win   += tstVBoxAPIWin 
    45 endif # VBOX_WITH_TESTCASES 
     30ifndef VBOX_ONLY_SDK 
     31 ifdef VBOX_WITH_TESTCASES 
     32  PROGRAMS       += tstAPI 
     33  PROGRAMS.linux += tstVBoxAPILinux 
     34  # That testcase is actually not linux specific, it's generic XPCOM. 
     35  PROGRAMS.solaris += tstVBoxAPILinux 
     36  PROGRAMS.win   += tstVBoxAPIWin 
     37 ifdef VBOX_WITH_RESOURCE_USAGE_API 
     38  PROGRAMS       += tstCollector 
     39 endif 
     40 else ifeq ($(USERNAME),dmik) 
     41  PROGRAMS       += tstAPI 
     42  PROGRAMS.linux += tstVBoxAPILinux 
     43  # That testcase is actually not linux specific, it's generic XPCOM. 
     44  PROGRAMS.solaris += tstVBoxAPILinux 
     45  PROGRAMS.win   += tstVBoxAPIWin 
     46 endif # VBOX_WITH_TESTCASES 
     47endif #! VBOX_ONLY_SDK 
    4648 
    4749INSTALLS += samples 

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

    r11627 r11721  
    2626# The rdesktop-vrdp program. 
    2727# 
    28 PROGRAMS += rdesktop-vrdp 
     28ifndef VBOX_ONLY_SDK 
     29 PROGRAMS += rdesktop-vrdp 
     30endif 
    2931rdesktop-vrdp_TEMPLATE = VBOXR3NPEXE 
    3032rdesktop-vrdp_SDKS = VBOX_OPENSSL 

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

    r11703 r11721  
    5656 LIBRARIES += RuntimeR3 
    5757 DLLS += VBoxRT 
     58 
     59else ifdef VBOX_ONLY_SDK 
     60 # Nothing really 
    5861 
    5962else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS 

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

    r10804 r11721  
    2626endif 
    2727include $(KBUILD_PATH)/subheader.kmk 
     28 
     29ifndef VBOX_ONLY_SDK 
    2830 
    2931# Include sub-makefiles. 
    …… 
    175177# 
    176178DLLS += VBoxVMM 
     179 
    177180VBoxVMM_TEMPLATE = VBOXR3 
    178181VBoxVMM_DEFS = $(VMMR3_DEFS) 
    …… 
    432435VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) 
    433436 
     437endif #!VBOX_ONLY_SDK 
    434438 
    435439include $(KBUILD_PATH)/subfooter.kmk 

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

    r10054 r11721  
    5252# validation testcases. Perhaps a bit hackish, but extremely useful. 
    5353# 
    54 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) 
    55  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) 
    56   OTHERS += \ 
     54ifndef 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 += \ 
    5758        $(PATH_TARGET)/tstAsmStructs.run \ 
    5859        $(PATH_TARGET)/tstVMStructSize.run 
     60  endif 
    5961 endif 
    6062endif 

  • trunk/src/apps/Makefile.kmk

    r11216 r11721  
    1414include $(KBUILD_PATH)/subheader.kmk 
    1515 
    16 ifdef 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 
     16ifndef 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 
    2022 endif 
    21 endif 
    22 ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),) 
    23  ifeq ($(KBUILD_TARGET),linux) 
    24   include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk 
     23 ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),) 
     24  ifeq ($(KBUILD_TARGET),linux) 
     25   include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk 
     26  endif 
    2527 endif 
    26 endif 
     28endif # !VBOX_ONLY_SDK 
    2729 
    2830include $(KBUILD_PATH)/subfooter.kmk 

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r11717 r11721  
    243243# length restrictions limit will be avoided. (Solaris, Mac?) 
    244244# 
     245 
     246ifndef VBOX_ONLY_SDK 
    245247LIBRARIES += \ 
    246248        VBox-xpcom-nspr \ 
    …… 
    266268        VBoxXPCOM \ 
    267269        VBoxXPCOMIPCC 
    268  
    269 # we put it here, as template it uses depends on VBoxRT, 
    270 # which may not be built yet 
    271 # r=bird: This doesn't work, it won't be built this way. The way to fix it is to make the order change in src/Makefile.kmk (or was it src/lib/Makefile.kmk) that puts src/VBox/Runtime before src/lib/xpcom18a4 standard for all builds. 
    272 OTHERS += \ 
    273         $(TARGET_VBoxHlp) 
    274  
    275270 
    276271ifdef VBOX_WITH_TESTCASES 
    …… 
    304299endif # VBOX_WITH_TESTCASES 
    305300PROGRAMS += VBoxXPCOMIPCD 
     301 
     302 
     303else 
     304 
     305PATH_VBox-xpcom-string=$(PATH_BIN) 
     306 
     307endif # !VBOX_ONLY_SDK 
    306308 
    307309ifeq ($(KBUILD_TARGET),linux) 
    …… 
    13181320  endif 
    13191321 endif 
     1322ifndef VBOX_ONLY_SDK 
    13201323 DLLS += VBoxPython 
     1324endif 
    13211325 INSTALLS += VBoxPython-inst-py-xpcom 
    13221326 INSTALLS += VBoxPython-inst-sample 

  • trunk/src/recompiler/Makefile.kmk

    r10239 r11721  
    3737include $(KBUILD_PATH)/subheader.kmk 
    3838 
     39ifndef VBOX_ONLY_SDK 
    3940 
    4041BLDPROGS             += dyngen 
    …… 
    339340        $(MV) -f $@.tmp $@ 
    340341 
    341  
     342endif # !VBOX_ONLY_SDK 
    342343 
    343344include $(KBUILD_PATH)/subfooter.kmk 

  • trunk/src/testcase/Makefile.kmk

    r10181 r11721  
    2323include $(KBUILD_PATH)/subheader.kmk 
    2424 
    25 PROGRAMS += tstRunTestcases 
     25ifndef VBOX_ONLY_SDK 
     26 PROGRAMS += tstRunTestcases 
     27endif 
    2628 
    2729tstRunTestcases_TEMPLATE = VBOXR3TSTEXE 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy