ebl Permit to choose between wsock32 and ws2_32 in Makefile.inc

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8516 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/Makefile.inc.in b/bacula/src/win32/Makefile.inc.in
index 503d486b557b1641c4dda29619ad43ff746ea9cd..a174a4a8d6c0395f3c1ef12abd694f976a92d6f4 100644 (file)
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -89,6 +89,8 @@ LIBS_CATS := \
 LIBS_BACULA := \
         $(LIBDIR)/libbacula.a
 
+LIBS_NETWORK := -lwsock32
+
 HAVES := \
         -DHAVE_WIN32 \
         -DHAVE_MINGW \

diff --git a/bacula/src/win32/console/Makefile b/bacula/src/win32/console/Makefile
index bf81e02c63b372fbc236ad544c00145f344bb676..fac55b5329146940a7c28633cfff26990c40293f 100644 (file)
--- a/bacula/src/win32/console/Makefile
+++ b/bacula/src/win32/console/Makefile
@@ -28,8 +28,7 @@ CONSOLE_OBJS = \
 
 ALL_OBJS = $(CONSOLE_OBJS)
 
-CONSOLE_LIBS = \
-       -lwsock32
+CONSOLE_LIBS = $(LIBS_NETWORK) 
 
 ######################################################################
 

diff --git a/bacula/src/win32/dird/Makefile b/bacula/src/win32/dird/Makefile
index acede826d673569e72dcf5fa35b23a978a6560c7..b06b130d56ae9550cc2cc455cf4ed7651e75fea3 100644 (file)
--- a/bacula/src/win32/dird/Makefile
+++ b/bacula/src/win32/dird/Makefile
@@ -79,9 +79,9 @@ ALL_OBJS = $(DIRD_OBJS)
 
 DIRD_LIBS = \
        $(LIBS_PTHREADS) \
+       $(LIBS_NETWORK) \
        -lole32 \
        -loleaut32 \
-       -lwsock32 \
        -luuid \
        -lcomctl32
 

diff --git a/bacula/src/win32/filed/Makefile b/bacula/src/win32/filed/Makefile
index 5f262938805727beeb03a1f336c5256b7c9ac8a0..e0e621db67e28cd8e6b6c1c17370c65a90d3719b 100644 (file)
--- a/bacula/src/win32/filed/Makefile
+++ b/bacula/src/win32/filed/Makefile
@@ -60,9 +60,9 @@ ALL_OBJS = $(FILED_OBJS)
 FILED_LIBS = \
        $(LIBS_PTHREADS) \
        $(LIBS_ZLIB) \
+        $(LIBS_NETWORK) \
        -lole32 \
        -loleaut32 \
-       -lwsock32 \
        -luuid \
        -lcomctl32
 

diff --git a/bacula/src/win32/lib/Makefile b/bacula/src/win32/lib/Makefile
index f3baea021b3c3c6dfa748f046a79b41b30298c0a..e6c31857464767ac03c3c125c68ddc72174b1062 100644 (file)
--- a/bacula/src/win32/lib/Makefile
+++ b/bacula/src/win32/lib/Makefile
@@ -109,7 +109,7 @@ LIBS_DLL = \
        $(LIBS_CRYPTO) \
        $(LIBS_PTHREADS) \
        $(LIBS_ZLIB) \
-       -lwsock32 \
+        $(LIBS_NETWORK) \
        -lole32 \
        -loleaut32 \
        -luuid

diff --git a/bacula/src/win32/stored/Makefile b/bacula/src/win32/stored/Makefile
index dfff5b978df5e623bfe32396e5ff5a0bd619b81e..9acc4d870e094be26b94ce358cbaa379079682c1 100644 (file)
--- a/bacula/src/win32/stored/Makefile
+++ b/bacula/src/win32/stored/Makefile
@@ -95,9 +95,9 @@ ALL_OBJS = \
 
 LIBS_STORED = \
        $(LIBS_PTHREADS) \
+        $(LIBS_NETWORK) \
        -lole32 \
        -loleaut32 \
-       -lwsock32 \
        -luuid \
        -lcomctl32
 

diff --git a/bacula/src/win32/wx-console/Makefile b/bacula/src/win32/wx-console/Makefile
index 67ab84a6b357ae2b10a7a5f11149b45a74eb2247..14c9535456766ae9b1409835f5aa2df750ab3e92 100755 (executable)
--- a/bacula/src/win32/wx-console/Makefile
+++ b/bacula/src/win32/wx-console/Makefile
@@ -52,8 +52,8 @@ ALL_OBJS = $(CONSOLE_OBJS)
 
 CONSOLE_LIBS = \
        $(LIBS_WX) \
+        $(LIBS_NETWORK) \
        -lcomctl32 \
-       -lwsock32 \
        -lole32 \
        -loleaut32 \
        -luuid