diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-10 13:21:33 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-10 13:21:33 +0000 |
| commit | 171e929a08098b6c844887adc43879c7579dc15f (patch) | |
| tree | 6b4d2e3bc20dbd4dc9a1f031416e66614c53dd21 /xserver/dix/Makefile.in | |
| parent | 68781b09de2c95b87ea898c4ecf3018dfb4460d2 (diff) | |
Update to xserver 1.12.2. tested by naddy@, krw@, mpi@.
Diffstat (limited to 'xserver/dix/Makefile.in')
| -rw-r--r-- | xserver/dix/Makefile.in | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/xserver/dix/Makefile.in b/xserver/dix/Makefile.in index beb34290b..a3c1009a9 100644 --- a/xserver/dix/Makefile.in +++ b/xserver/dix/Makefile.in @@ -68,7 +68,7 @@ am_libdix_la_OBJECTS = atom.lo colormap.lo cursor.lo devices.lo \ globals.lo glyphcurs.lo grabs.lo initatoms.lo inpututils.lo \ pixmap.lo privates.lo property.lo ptrveloc.lo region.lo \ registry.lo resource.lo selection.lo swaprep.lo swapreq.lo \ - tables.lo window.lo + tables.lo touch.lo window.lo libdix_la_OBJECTS = $(am_libdix_la_OBJECTS) libmain_la_LIBADD = am_libmain_la_OBJECTS = main.lo @@ -110,7 +110,6 @@ AGP_FALSE = @AGP_FALSE@ AGP_TRUE = @AGP_TRUE@ AIGLX_DRI_LOADER_FALSE = @AIGLX_DRI_LOADER_FALSE@ AIGLX_DRI_LOADER_TRUE = @AIGLX_DRI_LOADER_TRUE@ -ALLOCA = @ALLOCA@ ALPHA_VIDEO_FALSE = @ALPHA_VIDEO_FALSE@ ALPHA_VIDEO_TRUE = @ALPHA_VIDEO_TRUE@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -129,6 +128,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ BASE_FONT_PATH = @BASE_FONT_PATH@ BSD_APM_FALSE = @BSD_APM_FALSE@ BSD_APM_TRUE = @BSD_APM_TRUE@ @@ -336,8 +336,6 @@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LINUX_ALPHA_FALSE = @LINUX_ALPHA_FALSE@ LINUX_ALPHA_TRUE = @LINUX_ALPHA_TRUE@ -LINUX_IA64_FALSE = @LINUX_IA64_FALSE@ -LINUX_IA64_TRUE = @LINUX_IA64_TRUE@ LIPO = @LIPO@ LNXACPI_FALSE = @LNXACPI_FALSE@ LNXACPI_TRUE = @LNXACPI_TRUE@ @@ -356,10 +354,6 @@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MITSHM_FALSE = @MITSHM_FALSE@ MITSHM_TRUE = @MITSHM_TRUE@ -NEED_STRLCAT_FALSE = @NEED_STRLCAT_FALSE@ -NEED_STRLCAT_TRUE = @NEED_STRLCAT_TRUE@ -NEED_VSNPRINTF_FALSE = @NEED_VSNPRINTF_FALSE@ -NEED_VSNPRINTF_TRUE = @NEED_VSNPRINTF_TRUE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJC = @OBJC@ @@ -503,18 +497,18 @@ XNEST_SYS_LIBS = @XNEST_SYS_LIBS@ XNEST_TRUE = @XNEST_TRUE@ XORG_BUS_BSDPCI_FALSE = @XORG_BUS_BSDPCI_FALSE@ XORG_BUS_BSDPCI_TRUE = @XORG_BUS_BSDPCI_TRUE@ -XORG_BUS_LINUXPCI_FALSE = @XORG_BUS_LINUXPCI_FALSE@ -XORG_BUS_LINUXPCI_TRUE = @XORG_BUS_LINUXPCI_TRUE@ +XORG_BUS_PCI_FALSE = @XORG_BUS_PCI_FALSE@ +XORG_BUS_PCI_TRUE = @XORG_BUS_PCI_TRUE@ XORG_BUS_SPARC_FALSE = @XORG_BUS_SPARC_FALSE@ XORG_BUS_SPARC_TRUE = @XORG_BUS_SPARC_TRUE@ XORG_CFLAGS = @XORG_CFLAGS@ XORG_FALSE = @XORG_FALSE@ XORG_INCS = @XORG_INCS@ XORG_LIBS = @XORG_LIBS@ +XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@ XORG_MODULES_LIBS = @XORG_MODULES_LIBS@ -XORG_OS = @XORG_OS@ XORG_OS_SUBDIR = @XORG_OS_SUBDIR@ XORG_SGML_PATH = @XORG_SGML_PATH@ XORG_SYS_LIBS = @XORG_SYS_LIBS@ @@ -679,6 +673,7 @@ libdix_la_SOURCES = \ swaprep.c \ swapreq.c \ tables.c \ + touch.c \ window.c EXTRA_DIST = buildatoms BuiltInAtoms Xserver.d Xserver-dtrace.h.in @@ -786,6 +781,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swaprep.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swapreq.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tables.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touch.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@ .c.o: |