server: No longer depend on libwine.

server/Makefile.in

@@ -50,4 +50,4 @@ MANPAGES = \
 	wineserver.fr.UTF-8.man.in \
 	wineserver.man.in
 
-EXTRALIBS = $(LDEXECFLAGS) -lwine $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS)
+EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS)

server/mach.c

@@ -41,7 +41,6 @@
 #include "process.h"
 #include "thread.h"
 #include "request.h"
-#include "wine/library.h"
 
 #ifdef USE_MACH
 

server/main.c

@@ -36,7 +36,6 @@
 #include "file.h"
 #include "thread.h"
 #include "request.h"
-#include "wine/library.h"
 
 /* command-line options */
 int debug_level = 0;
@@ -108,7 +107,7 @@ static void parse_args( int argc, char *argv[] )
                     master_socket_timeout = TIMEOUT_INFINITE;
                 break;
             case 'v':
-                fprintf( stderr, "%s\n", wine_get_build_id());
+                fprintf( stderr, "%s\n", PACKAGE_STRING );
                 exit(0);
             case 'w':
                 wait_for_lock();

server/registry.c

@@ -48,7 +48,6 @@
 #include "security.h"
 
 #include "winternl.h"
-#include "wine/library.h"
 
 struct notify
 {

server/request.c

@@ -61,7 +61,6 @@
 #include "winbase.h"
 #include "wincon.h"
 #include "winternl.h"
-#include "wine/library.h"
 
 #include "file.h"
 #include "process.h"