From 59b0d7b20235a98d9164f22a1dbed94c74d68b71 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sun, 23 Apr 2000 20:41:04 +0000
Subject: [PATCH] Build wineclipsrv as part of the x11drv dll.

---
 Makefile.in             |  6 ++----
 dlls/x11drv/Makefile.in | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ef9332f8607..2d1f6a8b639 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,8 +71,7 @@ INCSUBDIRS = include
 # Stand-alone programs
 PROGRAMS = \
 	loader/dos/dosmod \
-	server/wineserver \
-	windows/x11drv/wineclipsrv
+	server/wineserver
 
 # Programs that link with libwine
 LIBPROGRAMS = \
@@ -176,13 +175,12 @@ install_wine: wine
 install:: $(PROGRAMS) $(LIBPROGRAMS) $(EMU_TARGET:%=install_%) $(LIBEXT:%=install_%)
 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
 	$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
-	$(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
 	$(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod
 	$(INSTALL_PROGRAM) debugger/winedbg $(bindir)/winedbg
 
 uninstall::
 	cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) wine.sym
-	cd $(bindir) && $(RM) wine wineserver wineclipsrv dosmod winedbg
+	cd $(bindir) && $(RM) wine wineserver dosmod winedbg
 
 lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in Make.rules.in
 	$(LDSHARED) $(OBJS) -o $@
diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in
index 96d38bc0b2f..ff208147a22 100644
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@@ -10,6 +10,9 @@ SPEC_SRCS = x11drv.spec
 C_SRCS = \
 	x11drv_main.c
 
+PROGRAMS = \
+	$(TOPOBJDIR)/windows/x11drv/wineclipsrv
+
 EXTRA_OBJS = \
 	$(TOPOBJDIR)/graphics/x11drv/x11drv.o \
 	$(TOPOBJDIR)/tsx11/tsx11.o \
@@ -22,7 +25,16 @@ SUBDIRS = \
 
 @MAKE_DLL_RULES@
 
-$(EXTRA_OBJS): $(TOOLSUBDIRS) dummy
+all: $(PROGRAMS)
+
+$(EXTRA_OBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy
 	@cd `dirname $@` && $(MAKE) `basename $@`
 
+install:: $(PROGRAMS)
+	[ -d $(bindir) ] || $(MKDIR) $(bindir)
+	$(INSTALL_PROGRAM) $(TOPOBJDIR)/windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
+
+uninstall::
+	cd $(bindir) && $(RM) wineclipsrv
+
 ### Dependencies: