From 3a20d23b48c1051e1f22295fd886cc7f643417f6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 10 Dec 2010 19:06:59 +0000
Subject: xserver git update 10/12/2010

---
 xorg-server/hw/xfree86/parser/Makefile.am | 101 +++++++++++++++---------------
 1 file changed, 51 insertions(+), 50 deletions(-)

(limited to 'xorg-server/hw/xfree86/parser/Makefile.am')

diff --git a/xorg-server/hw/xfree86/parser/Makefile.am b/xorg-server/hw/xfree86/parser/Makefile.am
index caf7079d4..6fe7b87c1 100644
--- a/xorg-server/hw/xfree86/parser/Makefile.am
+++ b/xorg-server/hw/xfree86/parser/Makefile.am
@@ -1,50 +1,51 @@
-if INSTALL_LIBXF86CONFIG
-noinst_LTLIBRARIES = libxf86config_internal.la
-lib_LIBRARIES = libxf86config.a
-LIBHEADERS = \
-	xf86Optrec.h \
-	xf86Parser.h
-else
-noinst_LTLIBRARIES = libxf86config_internal.la
-endif
-
-INTERNAL_SOURCES= \
-	Device.c \
-	Files.c \
-	Flags.c \
-	Input.c \
-	InputClass.c \
-	Layout.c \
-	Module.c \
-	Video.c \
-	Monitor.c \
-	Pointer.c \
-	Screen.c \
-	Vendor.c \
-	read.c \
-	scan.c \
-	write.c \
-	DRI.c \
-	Extensions.c
-
-libxf86config_internal_la_SOURCES = \
-	$(INTERNAL_SOURCES)
-
-libxf86config_a_SOURCES = \
-	$(INTERNAL_SOURCES)
-libxf86config_a_CFLAGS = $(AM_CFLAGS)
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\"
-
-EXTRA_DIST = \
-	Configint.h \
-	configProcs.h \
-	xf86Optrec.h \
-	xf86Parser.h \
-	xf86tokens.h
-
-sdk_HEADERS = \
-	xf86Parser.h \
-	xf86Optrec.h
+if INSTALL_LIBXF86CONFIG
+noinst_LTLIBRARIES = libxf86config_internal.la
+lib_LIBRARIES = libxf86config.a
+LIBHEADERS = \
+	xf86Optrec.h \
+	xf86Parser.h
+else
+noinst_LTLIBRARIES = libxf86config_internal.la
+endif
+
+INTERNAL_SOURCES= \
+	Device.c \
+	Files.c \
+	Flags.c \
+	Input.c \
+	InputClass.c \
+	Layout.c \
+	Module.c \
+	Video.c \
+	Monitor.c \
+	Pointer.c \
+	Screen.c \
+	Vendor.c \
+	read.c \
+	scan.c \
+	write.c \
+	DRI.c \
+	Extensions.c
+
+libxf86config_internal_la_SOURCES = \
+	$(INTERNAL_SOURCES)
+
+libxf86config_a_SOURCES = \
+	$(TOP_SRCDIR)/os/xprintf.c \
+	$(INTERNAL_SOURCES)
+libxf86config_a_CFLAGS = $(AM_CFLAGS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DDATADIR=\"$(datadir)\"
+
+EXTRA_DIST = \
+	Configint.h \
+	configProcs.h \
+	xf86Optrec.h \
+	xf86Parser.h \
+	xf86tokens.h
+
+sdk_HEADERS = \
+	xf86Parser.h \
+	xf86Optrec.h
-- 
cgit v1.2.3