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/include/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/include/Makefile.in')
| -rw-r--r-- | xorg-server/include/Makefile.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xorg-server/include/Makefile.in b/xorg-server/include/Makefile.in index 3fe3a0519..e1d16195f 100644 --- a/xorg-server/include/Makefile.in +++ b/xorg-server/include/Makefile.in @@ -90,12 +90,12 @@ am__sdk_HEADERS_DIST = XIstubs.h bstore.h bstorestr.h closestr.h \ cursorstr.h dix.h dixaccess.h dixevents.h dixfont.h \ dixfontstr.h dixgrabs.h dixstruct.h events.h exevents.h \ extension.h extinit.h extnsionst.h gc.h gcstruct.h globals.h \ - input.h inputstr.h misc.h miscstruct.h opaque.h os.h pixmap.h \ - pixmapstr.h privates.h property.h propertyst.h ptrveloc.h \ - region.h regionstr.h registry.h resource.h rgb.h screenint.h \ - scrnintstr.h selection.h servermd.h site.h swaprep.h swapreq.h \ - validate.h window.h windowstr.h xkbfile.h xkbsrv.h xkbstr.h \ - xkbrules.h xserver-properties.h + input.h inputstr.h list.h misc.h miscstruct.h opaque.h os.h \ + pixmap.h pixmapstr.h privates.h property.h propertyst.h \ + ptrveloc.h region.h regionstr.h registry.h resource.h rgb.h \ + screenint.h scrnintstr.h selection.h servermd.h site.h \ + swaprep.h swapreq.h validate.h window.h windowstr.h xkbfile.h \ + xkbsrv.h xkbstr.h xkbrules.h xserver-properties.h HEADERS = $(nodist_sdk_HEADERS) $(sdk_HEADERS) ETAGS = etags CTAGS = ctags @@ -135,6 +135,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@ @@ -266,6 +267,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@ @@ -430,6 +433,7 @@ top_srcdir = @top_srcdir@ @XORG_TRUE@ globals.h \ @XORG_TRUE@ input.h \ @XORG_TRUE@ inputstr.h \ +@XORG_TRUE@ list.h \ @XORG_TRUE@ misc.h \ @XORG_TRUE@ miscstruct.h \ @XORG_TRUE@ opaque.h \ |