From 460145a5d52b5325fa5e920cee3699fcf7dd9afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Thu, 6 Oct 2005 19:37:39 +0000
Subject: [PATCH] Add cpconfig.c to EXTRA_DIST. Add CURSOR.NOTES to EXTRA_DIST.
 Add extrapci.ids to EXTRA_DIST and fix xf86PciIds.h rule.

---
 ChangeLog                      | 7 +++++++
 hw/xfree86/parser/Makefile.am  | 3 ++-
 hw/xfree86/ramdac/Makefile.am  | 3 ++-
 hw/xfree86/scanpci/Makefile.am | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 482dc6ca1..abfecee68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-06  Kristian Høgsberg  <krh@redhat.com>
+
+	* hw/xfree86/parser/Makefile.am: Add cpconfig.c to EXTRA_DIST.
+	* hw/xfree86/ramdac/Makefile.am: Add CURSOR.NOTES to EXTRA_DIST.
+	* hw/xfree86/scanpci/Makefile.am: Add extrapci.ids to EXTRA_DIST
+	and fix xf86PciIds.h rule.
+
 2005-10-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* hw/vfb/Makefile.am:
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 5dfa33dd0..b750dda8b 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -10,4 +10,5 @@ EXTRA_DIST = \
 	configProcs.h \
 	xf86Optrec.h \
 	xf86Parser.h \
-	xf86tokens.h
+	xf86tokens.h \
+	cpconfig.c
diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am
index 8fd861517..c9afdad60 100644
--- a/hw/xfree86/ramdac/Makefile.am
+++ b/hw/xfree86/ramdac/Makefile.am
@@ -9,7 +9,8 @@ libramdac_la_SOURCES = xf86RamDacMod.c xf86RamDac.c xf86RamDacCmap.c \
 sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h
 
 DISTCLEANFILES = xf86BitOrder.c
-EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h
+EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
+	CURSOR.NOTES
 
 AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
             $(XORG_CFLAGS)
diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am
index cc0b386cc..7e5671aa1 100644
--- a/hw/xfree86/scanpci/Makefile.am
+++ b/hw/xfree86/scanpci/Makefile.am
@@ -19,6 +19,7 @@ EXTRA_DIST = \
 	xf86PciStr.h \
 	xf86ScanPci.h \
 	pci.ids \
+	extrapci.ids \
 	pciid2c.pl
 
 xf86PciData.c:
@@ -26,6 +27,6 @@ xf86PciData.c:
 	echo "#include \"$(srcdir)/xf86ScanPci.c\"" >> $@
 
 xf86PciIds.h: $(srcdir)/../common/xf86PciInfo.h
-	$(PERL) $(srcdir)/pciid2c.pl $(srcdir)/../common/xf86PciInfo.h < $(srcdir)/pci.ids $(srcdir)/extrapci.ids > xf86PciIds.h
+	cat $(srcdir)/pci.ids $(srcdir)/extrapci.ids | $(PERL) $(srcdir)/pciid2c.pl $(srcdir)/../common/xf86PciInfo.h > xf86PciIds.h
 
 DISTCLEANFILES = xf86PciData.c xf86PciIds.h