diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
| commit | ac80633ce275edddaa3e4fa2ae0c048ed00f7d74 (patch) | |
| tree | 7d4ceffed59f2782533d3485c075f605ab1b9c61 /xorg-server/hw/xwin/Makefile.in | |
| parent | 6fc6cb8c935fab174e4582909c1cb4f12bd598bf (diff) | |
| download | vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.gz vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.bz2 vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.zip | |
svn merge -c505 ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/Makefile.in')
| -rw-r--r-- | xorg-server/hw/xwin/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/Makefile.in b/xorg-server/hw/xwin/Makefile.in index 1d7fb3b20..cbd49134b 100644 --- a/xorg-server/hw/xwin/Makefile.in +++ b/xorg-server/hw/xwin/Makefile.in @@ -75,9 +75,9 @@ am__XWin_SOURCES_DIST = InitInput.c InitOutput.c winallpriv.c \ winscrinit.c winshaddd.c winshadddnl.c winshadgdi.c \ wintrayicon.c winvalargs.c winwakeup.c winwindow.c \ winwndproc.c ddraw.h winclipboard.h winconfig.h win.h \ - winkeybd.h winkeymap.h winkeynames.h winlayouts.h \ - winmessages.h winmsg.h winms.h winmultiwindowclass.h \ - winprefs.h winpriv.h winresource.h winwindow.h XWin.rc \ + winkeybd.h winkeynames.h winlayouts.h winmessages.h winmsg.h \ + winms.h winmultiwindowclass.h winprefs.h winpriv.h \ + winresource.h winwindow.h XWin.rc \ $(top_srcdir)/Xext/dpmsstubs.c $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c $(top_srcdir)/fb/fbcmap_mi.c \ winclipboardinit.c winclipboardtextconv.c winclipboardthread.c \ @@ -241,6 +241,7 @@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@ +DEFAULT_LOGDIR = @DEFAULT_LOGDIR@ DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@ DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@ DEFS = $(DEFS_CLIPBOARD) \ @@ -380,6 +381,8 @@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = sed +SELINUX_CFLAGS = @SELINUX_CFLAGS@ +SELINUX_LIBS = @SELINUX_LIBS@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHA1_CFLAGS = @SHA1_CFLAGS@ @@ -609,7 +612,6 @@ SRCS = InitInput.c \ winconfig.h \ win.h \ winkeybd.h \ - winkeymap.h \ winkeynames.h \ winlayouts.h \ winmessages.h \ |