Changeset 18801 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Apr 7, 2009 10:33:10 AM (16 years ago)

Author:

vboxsync

Message:

webservices: allow to override VBOX_GSOAP_CXX_SOURCES and VBOX_GSOAP_CXX_LIBS with empty values; add VBOX_GSOAP_CXX_LIBS when linking the binaries (adding this to vboxsoap does not work without hacks)

File:

• trunk/src/VBox/Main/webservice/Makefile.kmk (modified) (4 diffs)

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

@@ -125 +125 @@
 
 VBOX_PATH_GSOAP_IMPORT := $(strip $(if $(VBOX_PATH_GSOAP_IMPORT),$(VBOX_PATH_GSOAP_IMPORT),$(VBOX_PATH_GSOAP)/import))
-VBOX_GSOAP_INCS        := $(strip $(if $(VBOX_GSOAP_INCS),       $(VBOX_GSOAP_INCS),       $(VBOX_PATH_GSOAP) $(VBOX_PATH_GSOAP_IMPORT) ))
-VBOX_GSOAP_CXX_SOURCES := $(strip $(if $(VBOX_GSOAP_CXX_SOURCES),$(VBOX_GSOAP_CXX_SOURCES),$(VBOX_PATH_GSOAP)/stdsoap2.cpp))
-VBOX_GSOAP_CXX_LIBS    := $(strip $(if $(VBOX_GSOAP_CXX_LIBS),   $(VBOX_GSOAP_CXX_LIBS),))
+VBOX_GSOAP_INCS        := $(strip $(if $(VBOX_GSOAP_INCS),$(VBOX_GSOAP_INCS),$(VBOX_PATH_GSOAP) $(VBOX_PATH_GSOAP_IMPORT) ))
+# note: $(if $(defined FOO)) does not work here!
+VBOX_GSOAP_CXX_SOURCES := $(strip $(if-expr "$(origin VBOX_GSOAP_CXX_SOURCES)" != "undefined",$(VBOX_GSOAP_CXX_SOURCES),$(VBOX_PATH_GSOAP)/stdsoap2.cpp))
+VBOX_GSOAP_CXX_LIBS    := $(strip $(if-expr "$(origin VBOX_GSOAP_CXX_LIBS)" != "undefined",$(VBOX_GSOAP_CXX_LIBS),))
 
 
@@ -220 +221 @@
  vboxsoap_SOURCES += \
         $(VBOX_GSOAP_CXX_SOURCES)
- vboxsoap_LIBS += \
-        $(VBOX_GSOAP_CXX_LIBS)
  vboxsoap_ORDERDEPS = \
         $(VBOXWEB_IDL_SRC) \
@@ -256 +255 @@
  endif
  vboxwebsrv_LIBS += \
-        $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB)
+        $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
+        $(VBOX_GSOAP_CXX_LIBS)
  vboxwebsrv_LIBS.solaris += socket nsl
  vboxwebsrv_SOURCES = \
@@ -284 +284 @@
      .
  webtest_LIBS += \
-        $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB)
+        $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
+        $(VBOX_GSOAP_CXX_LIBS)
  webtest_LIBS.solaris += nsl
  webtest_SOURCES = \