Fix building with mingw and make sure linking generates proper DLL files

15 files changed, 16 insertions, 14 deletions

diff --git a/src/core/transport/amqp/receiver/Makefile.am b/src/core/transport/amqp/receiver/Makefile.am
index 0e2f0f8..882807b 100644
--- a/src/core/transport/amqp/receiver/Makefile.am
+++ b/src/core/transport/amqp/receiver/Makefile.am
@@ -22,7 +22,7 @@ libaxis2_amqp_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
 								   $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \

 								   $(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/libaxis2_qpid_receiver.la

 

-libaxis2_amqp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)

+libaxis2_amqp_receiver_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)

 

 INCLUDES = -I$(top_builddir)/include \

 	       -I$(top_builddir)/src/core/transport/amqp/util \

diff --git a/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am b/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
index faf0c34..2535545 100644
--- a/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
+++ b/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
@@ -25,7 +25,7 @@ libaxis2_qpid_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
 								   $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \

 								   $(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor/libaxis2_amqp_request_processor.la

 

-libaxis2_qpid_receiver_la_LDFLAGS = g++ -version-info $(VERSION_NO)

+libaxis2_qpid_receiver_la_LDFLAGS = g++ -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)

 

 INCLUDES = -I$(top_builddir)/include \

 	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \

diff --git a/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am b/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
index 991e7a5..daa2a15 100644
--- a/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
+++ b/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
@@ -19,7 +19,7 @@ libaxis2_amqp_request_processor_la_SOURCES = axis2_amqp_request_processor.c
 libaxis2_amqp_request_processor_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \

 											$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la

 

-libaxis2_amqp_request_processor_la_LDFLAGS = -version-info $(VERSION_NO)

+libaxis2_amqp_request_processor_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)

 

 INCLUDES = -I$(top_builddir)/include \

 	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor \

diff --git a/src/core/transport/amqp/sender/Makefile.am b/src/core/transport/amqp/sender/Makefile.am
index 9b662ed..68cfc9a 100644
--- a/src/core/transport/amqp/sender/Makefile.am
+++ b/src/core/transport/amqp/sender/Makefile.am
@@ -22,7 +22,7 @@ libaxis2_amqp_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
 								 $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \

 								 $(top_builddir)/src/core/transport/amqp/sender/qpid_sender/libaxis2_qpid_sender.la

 

-libaxis2_amqp_sender_la_LDFLAGS = -version-info $(VERSION_NO)

+libaxis2_amqp_sender_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)

 

 INCLUDES = -I$(top_builddir)/include \

 	       -I$(top_builddir)/src/core/transport/amqp/util \

diff --git a/src/core/transport/amqp/sender/qpid_sender/Makefile.am b/src/core/transport/amqp/sender/qpid_sender/Makefile.am
index 5f3d34c..c064041 100644
--- a/src/core/transport/amqp/sender/qpid_sender/Makefile.am
+++ b/src/core/transport/amqp/sender/qpid_sender/Makefile.am
@@ -21,7 +21,7 @@ libaxis2_qpid_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
 								 $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \

 								 $(QPID_HOME)/lib/libqpidclient.la

 

-libaxis2_qpid_sender_la_LDFLAGS = g++ -version-info $(VERSION_NO)

+libaxis2_qpid_sender_la_LDFLAGS = g++ -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)

 

 INCLUDES = -I$(top_builddir)/include \

 	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \

diff --git a/src/core/transport/amqp/util/Makefile.am b/src/core/transport/amqp/util/Makefile.am
index 0ecda7e..61cbe6c 100644
--- a/src/core/transport/amqp/util/Makefile.am
+++ b/src/core/transport/amqp/util/Makefile.am
@@ -18,7 +18,7 @@ libaxis2_amqp_util_la_SOURCES = axis2_amqp_util.c
 
 libaxis2_amqp_util_la_LIBADD = $(top_builddir)/util/src/libaxutil.la
 
-libaxis2_amqp_util_la_LDFLAGS = -version-info $(VERSION_NO)
+libaxis2_amqp_util_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)
 
 INCLUDES = -I$(top_builddir)/include \
 	       -I$(top_builddir)/src/core/transport/amqp/util \
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 \
diff --git a/src/core/transport/tcp/receiver/Makefile.am b/src/core/transport/tcp/receiver/Makefile.am
index f9fb16c..68e5a17 100644
--- a/src/core/transport/tcp/receiver/Makefile.am
+++ b/src/core/transport/tcp/receiver/Makefile.am
@@ -23,7 +23,7 @@ libaxis2_tcp_receiver_la_SOURCES = tcp_svr_thread.c \
 									tcp_receiver.c
 
 
-libaxis2_tcp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
+libaxis2_tcp_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/tcp/sender/Makefile.am b/src/core/transport/tcp/sender/Makefile.am
index 2875299..17d364d 100644
--- a/src/core/transport/tcp/sender/Makefile.am
+++ b/src/core/transport/tcp/sender/Makefile.am
@@ -24,7 +24,7 @@ libaxis2_tcp_sender_la_LIBADD = $(top_builddir)/src/core/transport/http/common/l
 								 $(SSL_LIBS)
 
 
-libaxis2_tcp_sender_la_LDFLAGS = -version-info $(VERSION_NO)
+libaxis2_tcp_sender_la_LDFLAGS = -version-info $(VERSION_NO) $(WIN32_EXTRA_LDFLAGS)
 
 INCLUDES = -I$(top_builddir)/include \
 	   -I$(top_builddir)/src/core/transport\