Bug #5160: Fix the modular build to try to use the same logic for choosing

    the architecture/os-specific bus support as monolithic.

1 files changed, 36 insertions, 24 deletions

diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
index a9a70c9e8..51850d87d 100644
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -1,44 +1,56 @@
 noinst_LTLIBRARIES = libbus.la
 sdk_HEADERS = xf86Pci.h
 
-PCI_SOURCES = @XORG_OS_PCI@Pci.c 
+PCI_SOURCES =
+
+if XORG_BUS_LINUXPCI
+PCI_SOURCES += linuxPci.c
+endif
+
+if XORG_BUS_FREEBSDPCI
+PCI_SOURCES += freebsdPci.c
+endif
+
+if XORG_BUS_NETBSDPCI
+PCI_SOURCES += netbsdPci.c
+endif
 
 if XORG_BUS_IX86PCI
 PCI_SOURCES += ix86Pci.c
 endif
 
+if XORG_BUS_PPCPCI
+PCI_SOURCES += ppcPci.c
+endif
+
+if XORG_BUS_SPARCPCI
+PCI_SOURCES += sparcPci.c
+endif
+
+if LINUX_ALPHA
+PCI_SOURCES += axpPci.c
+endif
+
 if LINUX_IA64
-PLATFORM_PCI_SOURCES = 460gxPCI.c altixPCI.c e8870PCI.c zx1PCI.c
+PLATFORM_PCI_SOURCES = \
+	460gxPCI.c \
+	460gxPCI.h \
+	altixPCI.c \
+	altixPCI.h \
+	e8870PCI.c \
+	e8870PCI.h \
+	zx1PCI.c \
+	zx1PCI.h
 endif
 
 if XORG_BUS_SPARC
-PLATFORM_PCI_SOURCES = sparcPci.c
 PLATFORM_SOURCES = Sbus.c
+sdk_HEADERS += xf86Sbus.h
 endif
 
-libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
+libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
                     $(PLATFORM_SOURCES)
 
 INCLUDES = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
-
-# hack to keep all the OS PCI support files in the distball even though
-# there aren't rules to build them all yet.  also the AC_SUBST pattern
-# above will defeat automake's EXTRA_DIST logic, woo.
-PCIDISTSOURCES = \
-	axpPci.c \
-	freebsdPci.c \
-	linuxPci.c \
-	netbsdPci.c \
-	ppcPci.c \
-	sparcPci.c
-
-EXTRA_DIST = \
-	460gxPCI.h \
-	Pci.h \
-	altixPCI.h \
-	e8870PCI.h \
-	zx1PCI.h \
-	xf86Sbus.h \
-        $(PCIDISTSOURCES)