Changeset 12212 in vbox for trunk/src

Timestamp:

Sep 8, 2008 9:49:39 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36190

Message:

libs/Makefile: consolidate if statements.

File:

• trunk/src/libs/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/Makefile.kmk

@@ -32 +32 @@
 # Compression libs used by IPRT and <what was it again?>.
 include $(PATH_SUB_CURRENT)/liblzf-1.51/Makefile.kmk
-if !defined(VBOX_ONLY_SDK)
- ifeq ($(SDK_VBOX_ZLIB_INCS),$(PATH_ROOT)/src/libs/zlib-1.2.1)
-  include $(PATH_SUB_CURRENT)/zlib-1.2.1/Makefile.kmk
- endif
+if !defined(VBOX_ONLY_SDK) \
+ && "$(SDK_VBOX_ZLIB_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.1"
+ include $(PATH_SUB_CURRENT)/zlib-1.2.1/Makefile.kmk
 endif
 
 # PNG support (for screenshots).
-if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK)
- ifeq ($(SDK_VBOX_LIBPNG_INCS),$(PATH_ROOT)/src/libs/libpng-1.2.8)
-  include $(PATH_SUB_CURRENT)/libpng-1.2.8/Makefile.kmk
- endif
+if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) \
+ && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.2.8"
+ include $(PATH_SUB_CURRENT)/libpng-1.2.8/Makefile.kmk
 endif # !VBOX_ONLY_DOCS
 
@@ -51 +49 @@
 
 # OpenSSL for VRDP.
-if defined(VBOX_WITH_VRDP) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK)
- ifeq ($(SDK_VBOX_OPENSSL_INCS),$(SDK_VBOX_OPENSSL_DEFAULT_INCS))
-  include $(PATH_SUB_CURRENT)/openssl-0.9.8h/Makefile.kmk
- endif
+if defined(VBOX_WITH_VRDP) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) \
+ && "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_DEFAULT_INCS)"
+ include $(PATH_SUB_CURRENT)/openssl-0.9.8h/Makefile.kmk
 endif