Skip to content
Snippets Groups Projects
Commit 59b0d7b2 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Build wineclipsrv as part of the x11drv dll.

parent a0d9ffda
No related branches found
No related tags found
No related merge requests found
......@@ -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 $@
......
......@@ -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:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment