Alexandre Julliard : server: No longer depend on libwine.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fc17535eb98a4b200d6a418337a7e280568c7cfd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fc17535eb98a4b200d6a41833...

Author: Alexandre Julliard 
Date:   Thu Dec  5 22:17:44 2019 +0100

server: No longer depend on libwine.

Signed-off-by: Alexandre Julliard

---

server/Makefile.in | 2 +-
 server/mach.c      | 1 -
 server/main.c      | 3 +--
 server/registry.c  | 1 -
 server/request.c   | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/Makefile.in b/server/Makefile.in
index b39bd30305..3f3761faab 100644
--- a/server/Makefile.in
+++ b/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)
diff --git a/server/mach.c b/server/mach.c
index e5a532dc6c..3690b29004 100644
--- a/server/mach.c
+++ b/server/mach.c
@@ -41,7 +41,6 @@
 #include "process.h"
 #include "thread.h"
 #include "request.h"
-#include "wine/library.h"

#ifdef USE_MACH

diff --git a/server/main.c b/server/main.c
index 7aed338e96..26986d34b3 100644
--- a/server/main.c
+++ b/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();
diff --git a/server/registry.c b/server/registry.c
index 48a0f28c97..964e2ebd58 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -48,7 +48,6 @@
 #include "security.h"

#include "winternl.h"
-#include "wine/library.h"

struct notify
 {
diff --git a/server/request.c b/server/request.c
index 4d3263917c..200c2697db 100644
--- a/server/request.c
+++ b/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"