diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-14 13:47:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-14 13:47:55 +0000 |
| commit | 8d38172d866775594af3185ae3fbd8d750677650 (patch) | |
| tree | 2514d176474cc8adf7911a57724cc681c1359b47 /xorg-server/hw/xwin/Makefile.am | |
| parent | 26f62ef5ccd04fa3a55632d808ca6e1061cfb983 (diff) | |
| download | vcxsrv-8d38172d866775594af3185ae3fbd8d750677650.tar.gz vcxsrv-8d38172d866775594af3185ae3fbd8d750677650.tar.bz2 vcxsrv-8d38172d866775594af3185ae3fbd8d750677650.zip | |
Updated to xorg-server-1.7.99.901
Diffstat (limited to 'xorg-server/hw/xwin/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xwin/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index a76b56957..8b1897235 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am @@ -151,7 +151,7 @@ XWin_DEPENDENCIES = $(XWIN_LIBS) XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) .rc.o: - $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\" + $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include XWin_LDFLAGS = -mwindows -static @@ -190,12 +190,14 @@ XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir) +xwinconfigdir = $(sysconfdir)/X11 +xwinconfig_DATA = system.XWinrc + include $(top_srcdir)/cpprules.in EXTRA_DIST = \ $(GLX_EXTRAS) \ $(MAN_SRCS) \ - _usr_X11R6_lib_X11_system.XWinrc \ X.ico \ XWin.rc \ xlaunch/config.cc \ |