From: Jan Engelhardt Date: 2011-07-01 17:19:00 +0200 build: always use shared libraries --- configure.in | 9 ++++----- gsoap/Makefile.am | 32 +++++++++++++++++++------------- gsoap/samples/autotest/Makefile.am | 2 +- gsoap/samples/databinding/Makefile.am | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) Index: gsoap-2.8.3/configure.in =================================================================== --- gsoap-2.8.3.orig/configure.in +++ gsoap-2.8.3/configure.in @@ -16,8 +16,7 @@ AM_PROG_CC_C_O AM_PROG_LEX AC_PROG_YACC AC_PROG_CPP -AC_PROG_RANLIB -#AC_PROG_LIBTOOL +LT_INIT AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL @@ -222,13 +221,13 @@ if test "x$with_openssl" = "xyes"; then WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" else AC_MSG_RESULT(no) WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz" SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" fi if test -n "$OPENSSL"; then WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}" @@ -240,7 +239,7 @@ else WSDL2H_EXTRA_FLAGS= WSDL2H_EXTRA_LIBS= SAMPLE_SSL_LIBS= - WSDL2H_SOAP_CPP_LIB="libgsoap++.a" + WSDL2H_SOAP_CPP_LIB="libgsoap++.la" fi AC_SUBST(WSDL2H_EXTRA_FLAGS) AC_SUBST(WSDL2H_EXTRA_LIBS) Index: gsoap-2.8.3/gsoap/Makefile.am =================================================================== --- gsoap-2.8.3.orig/gsoap/Makefile.am +++ gsoap-2.8.3/gsoap/Makefile.am @@ -34,20 +34,26 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp dom_cpp.cpp: dom.cpp $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp -lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a +lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la -libgsoap_a_SOURCES = stdsoap2.c dom.c -libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp -libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c -libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp -libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c -libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp -libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +libgsoap_la_SOURCES = stdsoap2.c dom.c +libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) +libgsoap_la_LDFLAGS = -release ${PACKAGE_VERSION} -version-info 0:0:0 +libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp +libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) +libgsoap___la_LDFLAGS = ${libgsoap_la_LDFLAGS} +libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c +libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +libgsoapck_la_LDFLAGS = ${libgsoap_la_LDFLAGS} +libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp +libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +libgsoapck___la_LDFLAGS = ${libgsoap_la_LDFLAGS} +libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c +libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +libgsoapssl_la_LDFLAGS = ${libgsoap_la_LDFLAGS} +libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp +libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +libgsoapssl___la_LDFLAGS = ${libgsoap_la_LDFLAGS} BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) Index: gsoap-2.8.3/gsoap/samples/autotest/Makefile.am =================================================================== --- gsoap-2.8.3.orig/gsoap/samples/autotest/Makefile.am +++ gsoap-2.8.3/gsoap/samples/autotest/Makefile.am @@ -14,7 +14,7 @@ SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/ WSDLINPUT=$(srcdir)/examples.wsdl SOAPHEADER=$(srcdir)/examples.h SOAP_CPP_SRC=soapC.cpp soapServer.cpp -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la $(SOAP_CPP_SRC) : $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) Index: gsoap-2.8.3/gsoap/samples/databinding/Makefile.am =================================================================== --- gsoap-2.8.3.orig/gsoap/samples/databinding/Makefile.am +++ gsoap-2.8.3/gsoap/samples/databinding/Makefile.am @@ -14,7 +14,7 @@ SOAP_FLAGS=-2 -CS -p address -I$(top_src WSDLINPUT=$(srcdir)/address.xsd SOAPHEADER=$(srcdir)/address.h SOAP_CPP_SRC=addressC.cpp -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la $(SOAP_CPP_SRC) : $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)