Build wineclipsrv as part of the x11drv dll.
This commit is contained in:
parent
a0d9ffdaa1
commit
59b0d7b202
|
@ -71,8 +71,7 @@ INCSUBDIRS = include
|
||||||
# Stand-alone programs
|
# Stand-alone programs
|
||||||
PROGRAMS = \
|
PROGRAMS = \
|
||||||
loader/dos/dosmod \
|
loader/dos/dosmod \
|
||||||
server/wineserver \
|
server/wineserver
|
||||||
windows/x11drv/wineclipsrv
|
|
||||||
|
|
||||||
# Programs that link with libwine
|
# Programs that link with libwine
|
||||||
LIBPROGRAMS = \
|
LIBPROGRAMS = \
|
||||||
|
@ -176,13 +175,12 @@ install_wine: wine
|
||||||
install:: $(PROGRAMS) $(LIBPROGRAMS) $(EMU_TARGET:%=install_%) $(LIBEXT:%=install_%)
|
install:: $(PROGRAMS) $(LIBPROGRAMS) $(EMU_TARGET:%=install_%) $(LIBEXT:%=install_%)
|
||||||
[ -d $(bindir) ] || $(MKDIR) $(bindir)
|
[ -d $(bindir) ] || $(MKDIR) $(bindir)
|
||||||
$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
|
$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
|
||||||
$(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
|
|
||||||
$(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod
|
$(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod
|
||||||
$(INSTALL_PROGRAM) debugger/winedbg $(bindir)/winedbg
|
$(INSTALL_PROGRAM) debugger/winedbg $(bindir)/winedbg
|
||||||
|
|
||||||
uninstall::
|
uninstall::
|
||||||
cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) wine.sym
|
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
|
lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in Make.rules.in
|
||||||
$(LDSHARED) $(OBJS) -o $@
|
$(LDSHARED) $(OBJS) -o $@
|
||||||
|
|
|
@ -10,6 +10,9 @@ SPEC_SRCS = x11drv.spec
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
x11drv_main.c
|
x11drv_main.c
|
||||||
|
|
||||||
|
PROGRAMS = \
|
||||||
|
$(TOPOBJDIR)/windows/x11drv/wineclipsrv
|
||||||
|
|
||||||
EXTRA_OBJS = \
|
EXTRA_OBJS = \
|
||||||
$(TOPOBJDIR)/graphics/x11drv/x11drv.o \
|
$(TOPOBJDIR)/graphics/x11drv/x11drv.o \
|
||||||
$(TOPOBJDIR)/tsx11/tsx11.o \
|
$(TOPOBJDIR)/tsx11/tsx11.o \
|
||||||
|
@ -22,7 +25,16 @@ SUBDIRS = \
|
||||||
|
|
||||||
@MAKE_DLL_RULES@
|
@MAKE_DLL_RULES@
|
||||||
|
|
||||||
$(EXTRA_OBJS): $(TOOLSUBDIRS) dummy
|
all: $(PROGRAMS)
|
||||||
|
|
||||||
|
$(EXTRA_OBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy
|
||||||
@cd `dirname $@` && $(MAKE) `basename $@`
|
@cd `dirname $@` && $(MAKE) `basename $@`
|
||||||
|
|
||||||
|
install:: $(PROGRAMS)
|
||||||
|
[ -d $(bindir) ] || $(MKDIR) $(bindir)
|
||||||
|
$(INSTALL_PROGRAM) $(TOPOBJDIR)/windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
|
||||||
|
|
||||||
|
uninstall::
|
||||||
|
cd $(bindir) && $(RM) wineclipsrv
|
||||||
|
|
||||||
### Dependencies:
|
### Dependencies:
|
||||||
|
|
Loading…
Reference in New Issue