From 7d61535076aa1ca484f453594b29e2ca052c2505 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sat, 16 Feb 2013 18:30:45 +0100 Subject: Fix building with mingw and make sure linking generates proper DLL files --- src/core/transport/http/common/Makefile.am | 2 +- src/core/transport/http/receiver/Makefile.am | 2 +- src/core/transport/http/sender/Makefile.am | 2 +- src/core/transport/http/sender/ntlm/default/Makefile.am | 2 ++ src/core/transport/http/sender/ntlm/heimdal/Makefile.am | 2 +- src/core/transport/http/sender/ntlm/libntlm/Makefile.am | 2 +- src/core/transport/http/server/apache2/Makefile.am | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/core/transport/http') diff --git a/src/core/transport/http/common/Makefile.am b/src/core/transport/http/common/Makefile.am index 84b6548..5c1db0d 100644 --- a/src/core/transport/http/common/Makefile.am +++ b/src/core/transport/http/common/Makefile.am @@ -29,7 +29,7 @@ libaxis2_http_common_la_LIBADD= $(top_builddir)/util/src/libaxutil.la\ $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\ $(top_builddir)/src/core/engine/libaxis2_engine.la -libaxis2_http_common_la_LDFLAGS = -version-info $(VERSION_NO) +libaxis2_http_common_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS) INCLUDES = -I$(top_builddir)/include \ -I$(top_builddir)/src/core/transport\ diff --git a/src/core/transport/http/receiver/Makefile.am b/src/core/transport/http/receiver/Makefile.am index 8e838e1..cf9bf22 100644 --- a/src/core/transport/http/receiver/Makefile.am +++ b/src/core/transport/http/receiver/Makefile.am @@ -22,7 +22,7 @@ libaxis2_http_receiver_la_SOURCES = http_receiver.c\ http_svr_thread.c -libaxis2_http_receiver_la_LDFLAGS = -version-info $(VERSION_NO) +libaxis2_http_receiver_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS) INCLUDES = -I$(top_builddir)/include \ -I$(top_builddir)/src/core/transport\ diff --git a/src/core/transport/http/sender/Makefile.am b/src/core/transport/http/sender/Makefile.am index dd314d3..0e1d2a4 100644 --- a/src/core/transport/http/sender/Makefile.am +++ b/src/core/transport/http/sender/Makefile.am @@ -55,7 +55,7 @@ libaxis2_http_sender_la_LIBADD = $(top_builddir)/src/core/transport/http/common/ $(SSL_LIBS) -libaxis2_http_sender_la_LDFLAGS = -version-info $(VERSION_NO) +libaxis2_http_sender_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS) INCLUDES = -I$(top_builddir)/include \ -I$(top_builddir)/src/core/transport\ diff --git a/src/core/transport/http/sender/ntlm/default/Makefile.am b/src/core/transport/http/sender/ntlm/default/Makefile.am index 1457475..a5a6849 100644 --- a/src/core/transport/http/sender/ntlm/default/Makefile.am +++ b/src/core/transport/http/sender/ntlm/default/Makefile.am @@ -20,5 +20,7 @@ libaxis2_ntlm_la_SOURCES = ../ntlm.c \ libaxis2_ntlm_la_LIBADD = $(top_builddir)/util/src/libaxutil.la +libaxis2_ntlm_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) + INCLUDES = -I$(top_builddir)/include \ -I$(top_builddir)/util/include diff --git a/src/core/transport/http/sender/ntlm/heimdal/Makefile.am b/src/core/transport/http/sender/ntlm/heimdal/Makefile.am index 05c6239..cadaa44 100644 --- a/src/core/transport/http/sender/ntlm/heimdal/Makefile.am +++ b/src/core/transport/http/sender/ntlm/heimdal/Makefile.am @@ -21,7 +21,7 @@ libaxis2_ntlm_la_SOURCES = ../ntlm.c \ libaxis2_ntlm_la_LIBADD = @NTLM_LDFLAGS@ \ $(top_builddir)/util/src/libaxutil.la -#libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO) +#libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS) INCLUDES = -I$(top_builddir)/include \ diff --git a/src/core/transport/http/sender/ntlm/libntlm/Makefile.am b/src/core/transport/http/sender/ntlm/libntlm/Makefile.am index 823c9c8..e9d142e 100644 --- a/src/core/transport/http/sender/ntlm/libntlm/Makefile.am +++ b/src/core/transport/http/sender/ntlm/libntlm/Makefile.am @@ -21,7 +21,7 @@ libaxis2_ntlm_la_SOURCES = ../ntlm.c \ libaxis2_ntlm_la_LIBADD = @NTLM_LDFLAGS@ \ $(top_builddir)/util/src/libaxutil.la -#libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO) +#libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS) INCLUDES = -I$(top_builddir)/include \ diff --git a/src/core/transport/http/server/apache2/Makefile.am b/src/core/transport/http/server/apache2/Makefile.am index ada2471..a5f559c 100644 --- a/src/core/transport/http/server/apache2/Makefile.am +++ b/src/core/transport/http/server/apache2/Makefile.am @@ -28,7 +28,7 @@ libmod_axis2_la_LIBADD = $(LDFLAGS) \ $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la\ $(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la -libmod_axis2_la_LDFLAGS = -version-info $(VERSION_NO) +libmod_axis2_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS) INCLUDES = -I$(top_builddir)/include \ -I$(top_builddir)/src/core/transport/http \ -- cgit v1.1-32-gdbae