Build wineclipsrv as part of the x11drv dll.
diff --git a/Makefile.in b/Makefile.in
index ef9332f..2d1f6a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,8 +71,7 @@
# 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:: $(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 96d38bc..ff20814 100644
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@@ -10,6 +10,9 @@
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 @@
@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:
