From f36f16f0551aa091c1ff154875aebe3d29cf51e7 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 28 Oct 2014 21:30:23 -0700 Subject: [PATCH] dri2: Distribute new pci_ids headers Create hw/xfree86/dri2/pci_ids/Makefile.am which includes all of the new pci id files in the tarballs. Build that from configure.ac, and run it from dri2/Makefile.am Signed-off-by: Keith Packard --- configure.ac | 1 + hw/xfree86/dri2/Makefile.am | 2 ++ hw/xfree86/dri2/pci_ids/Makefile.am | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 hw/xfree86/dri2/pci_ids/Makefile.am diff --git a/configure.ac b/configure.ac index fee048e36..bf385b33f 100644 --- a/configure.ac +++ b/configure.ac @@ -2556,6 +2556,7 @@ hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile +hw/xfree86/dri2/pci_ids/Makefile hw/xfree86/drivers/Makefile hw/xfree86/drivers/modesetting/Makefile hw/xfree86/exa/Makefile diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am index 502a2ee29..78e507bd3 100644 --- a/hw/xfree86/dri2/Makefile.am +++ b/hw/xfree86/dri2/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=pci_ids + noinst_LTLIBRARIES = libdri2.la AM_CFLAGS = \ -DHAVE_XORG_CONFIG_H \ diff --git a/hw/xfree86/dri2/pci_ids/Makefile.am b/hw/xfree86/dri2/pci_ids/Makefile.am new file mode 100644 index 000000000..c5111082b --- /dev/null +++ b/hw/xfree86/dri2/pci_ids/Makefile.am @@ -0,0 +1,11 @@ +EXTRA_DIST = \ + pci_id_driver_map.h \ + i810_pci_ids.h \ + i915_pci_ids.h \ + i965_pci_ids.h \ + r200_pci_ids.h \ + r300_pci_ids.h \ + r600_pci_ids.h \ + radeon_pci_ids.h \ + radeonsi_pci_ids.h \ + vmwgfx_pci_ids.h