Mercurial > mxe-octave

view src/gsoap-link-dom.patch @ 791:4d838a936a8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed compile tests in ./configure of package qt -fixed compile test for win32-g++ -removed compile test hacks since compile test works now -fixed odbc test for mingw32 -fixed iconv compile test for win32-g++ -fix ipv6 detection on win32-g++ -fix largefile detection on win32-g++ -fix getaddrinfo detection on win32-g++. Result is still negative, apparently correctly. -fix opengl detection on win32-g++ -removed obsolee opengl error hack -improved exempting win32-g++ from XLib test -improved zlib treatment when compiling on MAC for win32-g++ -finished rtti support -restored replacement of -lz with -lQtCore4 on ssl.pri -specifed "-no-fontcnfig" because this gets enabled now by default thanks to working freetype detection. -restored -openssl-linked, setting OPENSSL_LIBS and zlib fix in ssl.pri. Previous conclusion that these were unnecessary was apparently an experimental error. glib is now detected which I hope is a good thing.
author Mark Brand <mabrand@mabrand.nl>
date Fri, 19 Feb 2010 23:24:55 +0100
parents 29f1ba4559ae
children
line wrap: on
line source

This file is part of mingw-cross-env.
See doc/index.html for further information.

diff -urN a/gsoap/Makefile.am b/gsoap/Makefile.am
--- a/gsoap/Makefile.am	2009-11-07 21:07:06.000000000 +0100
+++ b/gsoap/Makefile.am	2010-01-22 21:33:36.000000000 +0100
@@ -31,22 +31,26 @@
 stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
 	$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp
 
+## do the same fo dom.cpp since we want to link it into the cpp libs and dom.c into the c libs
+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
 
-libgsoap_a_SOURCES = stdsoap2.c
+libgsoap_a_SOURCES = stdsoap2.c dom.c
 libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp
+libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
 libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c
+libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c
 libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
+libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
 libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c
+libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
 libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
+libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
 libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
 
-BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
+BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
 
 include_HEADERS = stdsoap2.h