Changeset 34478 in vbox

Timestamp:

Nov 29, 2010 4:22:12 PM (14 years ago)

Author:

vboxsync

Message:

build fix.

Location:

trunk/src

Files:

• Makefile.kmk (modified) (1 diff)
• libs/Makefile.kmk (modified) (5 diffs)

trunk/src/Makefile.kmk

@@ -25 +25 @@
 
 else if defined(VBOX_ONLY_TESTSUITE)
+ include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
  include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
 

trunk/src/libs/Makefile.kmk

@@ -27 +27 @@
 # Compression libs used by IPRT and <what was it again?>.
 include $(PATH_SUB_CURRENT)/liblzf-3.4/Makefile.kmk
-if !defined(VBOX_ONLY_SDK) \
+if  !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \
  && "$(SDK_VBOX_ZLIB_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.1"
  include $(PATH_SUB_CURRENT)/zlib-1.2.1/Makefile.kmk
@@ -33 +33 @@
 
 # PNG support (for screenshots).
-if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) \
+if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \
  && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.2.8"
  include $(PATH_SUB_CURRENT)/libpng-1.2.8/Makefile.kmk
@@ -39 +39 @@
 
 # Libcurl for inet access
-if defined(VBOX_WITH_LIBCURL) && !defined(VBOX_ONLY_SDK) \
+if defined(VBOX_WITH_LIBCURL) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \
  && "$(SDK_VBOX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.19.4/include"
  include $(PATH_SUB_CURRENT)/curl-7.19.4/Makefile.kmk
@@ -60 +60 @@
 endif
 
-# Main related things - XML and XSLT, XPCOM.
-if defined(VBOX_WITH_MAIN)
+# Main related things - XPCOM and XSLT.
+if defined(VBOX_WITH_MAIN) && !defined(VBOX_ONLY_TESTSUITE)
  if defined(VBOX_WITH_XPCOM) && !defined(VBOX_ONLY_DOCS)
   include $(PATH_SUB_CURRENT)/xpcom18a4/Makefile.kmk
  endif
-endif                                   # The above comment is wrong now, VBoxRT requires libxml.
 
- ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.6.30/include)
-  include $(PATH_SUB_CURRENT)/libxml2-2.6.30/Makefile.kmk
- endif
-
-if defined(VBOX_WITH_MAIN)
  ifeq ($(SDK_VBOX_LIBXSLT_INCS),$(PATH_ROOT)/src/libs/libxslt-1.1.22)
   include $(PATH_SUB_CURRENT)/libxslt-1.1.22/Makefile.kmk
@@ -82 +76 @@
   endif
  endif
+endif
 
-endif # VBOX_WITH_MAIN && !VBOX_ONLY_DOCS
+if !defined(VBOX_ONLY_TESTSUITE)
+ ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.6.30/include)
+  include $(PATH_SUB_CURRENT)/libxml2-2.6.30/Makefile.kmk
+ endif
+endif
 
-if defined(VBOX_WITH_CROGL) && !defined(VBOX_OSE) && !defined(VBOX_ONLY_DOCS)
+if  defined(VBOX_WITH_CROGL) && !defined(VBOX_OSE) \
+ && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_TESTSUITE)
  ifeq ($(KBUILD_TARGET),linux)
   include $(PATH_SUB_CURRENT)/mesa-7.2/Makefile.kmk