From: <ri...@us...> - 2009-03-10 14:44:18
|
Revision: 8516 http://bacula.svn.sourceforge.net/bacula/?rev=8516&view=rev Author: ricozz Date: 2009-03-10 14:43:46 +0000 (Tue, 10 Mar 2009) Log Message: ----------- ebl Permit to choose between wsock32 and ws2_32 in Makefile.inc Modified Paths: -------------- trunk/bacula/src/win32/Makefile.inc.in trunk/bacula/src/win32/console/Makefile trunk/bacula/src/win32/dird/Makefile trunk/bacula/src/win32/filed/Makefile trunk/bacula/src/win32/lib/Makefile trunk/bacula/src/win32/stored/Makefile trunk/bacula/src/win32/wx-console/Makefile Modified: trunk/bacula/src/win32/Makefile.inc.in =================================================================== --- trunk/bacula/src/win32/Makefile.inc.in 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/Makefile.inc.in 2009-03-10 14:43:46 UTC (rev 8516) @@ -89,6 +89,8 @@ LIBS_BACULA := \ $(LIBDIR)/libbacula.a +LIBS_NETWORK := -lwsock32 + HAVES := \ -DHAVE_WIN32 \ -DHAVE_MINGW \ Modified: trunk/bacula/src/win32/console/Makefile =================================================================== --- trunk/bacula/src/win32/console/Makefile 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/console/Makefile 2009-03-10 14:43:46 UTC (rev 8516) @@ -28,8 +28,7 @@ ALL_OBJS = $(CONSOLE_OBJS) -CONSOLE_LIBS = \ - -lwsock32 +CONSOLE_LIBS = $(LIBS_NETWORK) ###################################################################### Modified: trunk/bacula/src/win32/dird/Makefile =================================================================== --- trunk/bacula/src/win32/dird/Makefile 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/dird/Makefile 2009-03-10 14:43:46 UTC (rev 8516) @@ -79,9 +79,9 @@ DIRD_LIBS = \ $(LIBS_PTHREADS) \ + $(LIBS_NETWORK) \ -lole32 \ -loleaut32 \ - -lwsock32 \ -luuid \ -lcomctl32 Modified: trunk/bacula/src/win32/filed/Makefile =================================================================== --- trunk/bacula/src/win32/filed/Makefile 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/filed/Makefile 2009-03-10 14:43:46 UTC (rev 8516) @@ -60,9 +60,9 @@ FILED_LIBS = \ $(LIBS_PTHREADS) \ $(LIBS_ZLIB) \ + $(LIBS_NETWORK) \ -lole32 \ -loleaut32 \ - -lwsock32 \ -luuid \ -lcomctl32 Modified: trunk/bacula/src/win32/lib/Makefile =================================================================== --- trunk/bacula/src/win32/lib/Makefile 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/lib/Makefile 2009-03-10 14:43:46 UTC (rev 8516) @@ -109,7 +109,7 @@ $(LIBS_CRYPTO) \ $(LIBS_PTHREADS) \ $(LIBS_ZLIB) \ - -lwsock32 \ + $(LIBS_NETWORK) \ -lole32 \ -loleaut32 \ -luuid Modified: trunk/bacula/src/win32/stored/Makefile =================================================================== --- trunk/bacula/src/win32/stored/Makefile 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/stored/Makefile 2009-03-10 14:43:46 UTC (rev 8516) @@ -95,9 +95,9 @@ LIBS_STORED = \ $(LIBS_PTHREADS) \ + $(LIBS_NETWORK) \ -lole32 \ -loleaut32 \ - -lwsock32 \ -luuid \ -lcomctl32 Modified: trunk/bacula/src/win32/wx-console/Makefile =================================================================== --- trunk/bacula/src/win32/wx-console/Makefile 2009-03-09 17:20:18 UTC (rev 8515) +++ trunk/bacula/src/win32/wx-console/Makefile 2009-03-10 14:43:46 UTC (rev 8516) @@ -52,8 +52,8 @@ CONSOLE_LIBS = \ $(LIBS_WX) \ + $(LIBS_NETWORK) \ -lcomctl32 \ - -lwsock32 \ -lole32 \ -loleaut32 \ -luuid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |