build: Merge libpci/Makefile.am

cpukit/Makefile.am

@@ -488,6 +488,32 @@ libcpukit_a_SOURCES += libgnat/adasupp.c
 
 endif
 
+if LIBPCI
+
+libcpukit_a_SOURCES += libpci/pci_access.c
+libcpukit_a_SOURCES += libpci/pci_access_func.c
+libcpukit_a_SOURCES += libpci/pci_access_io.c
+libcpukit_a_SOURCES += libpci/pci_access_mem_be.c
+libcpukit_a_SOURCES += libpci/pci_access_mem.c
+libcpukit_a_SOURCES += libpci/pci_access_mem_le.c
+libcpukit_a_SOURCES += libpci/pci_bus.c
+libcpukit_a_SOURCES += libpci/pci_cfg_auto.c
+libcpukit_a_SOURCES += libpci/pci_cfg.c
+libcpukit_a_SOURCES += libpci/pci_cfg_peripheral.c
+libcpukit_a_SOURCES += libpci/pci_cfg_print_code.c
+libcpukit_a_SOURCES += libpci/pci_cfg_read.c
+libcpukit_a_SOURCES += libpci/pci_cfg_static.c
+libcpukit_a_SOURCES += libpci/pci_find.c
+libcpukit_a_SOURCES += libpci/pci_find_dev.c
+libcpukit_a_SOURCES += libpci/pci_for_each.c
+libcpukit_a_SOURCES += libpci/pci_for_each_child.c
+libcpukit_a_SOURCES += libpci/pci_for_each_dev.c
+libcpukit_a_SOURCES += libpci/pci_get_dev.c
+libcpukit_a_SOURCES += libpci/pci_irq.c
+libcpukit_a_SOURCES += libpci/pci_print.c
+
+endif
+
 if SHA
 
 libcpukit_a_SOURCES += libmd/sha256c.c
@@ -531,7 +557,6 @@ all-local: generate-vc-key
 # librtemscpu
 _SUBDIRS = . score rtems posix
 _SUBDIRS += libnetworking librpc
-_SUBDIRS += libpci
 _SUBDIRS += libmisc
 _SUBDIRS += libstdthreads
 _SUBDIRS += wrapup

cpukit/configure.ac

@@ -498,7 +498,6 @@ score/cpu/x86_64/Makefile
 score/cpu/no_cpu/Makefile
 posix/Makefile
 libnetworking/Makefile
-libpci/Makefile
 librpc/Makefile
 libmisc/Makefile
 libstdthreads/Makefile

cpukit/libpci/Makefile.am

@@ -1,35 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-include $(top_srcdir)/automake/multilib.am
-
-if LIBPCI
-
-
-## PCI Library
-noinst_LIBRARIES = libpci.a
-
-libpci_a_SOURCES  = pci_access.c
-libpci_a_SOURCES += pci_access_func.c
-libpci_a_SOURCES += pci_access_io.c
-libpci_a_SOURCES += pci_access_mem.c
-libpci_a_SOURCES += pci_access_mem_be.c
-libpci_a_SOURCES += pci_access_mem_le.c
-libpci_a_SOURCES += pci_cfg.c
-libpci_a_SOURCES += pci_cfg_auto.c
-libpci_a_SOURCES += pci_cfg_print_code.c
-libpci_a_SOURCES += pci_cfg_read.c
-libpci_a_SOURCES += pci_cfg_static.c
-libpci_a_SOURCES += pci_cfg_peripheral.c
-libpci_a_SOURCES += pci_find.c
-libpci_a_SOURCES += pci_find_dev.c
-libpci_a_SOURCES += pci_for_each.c
-libpci_a_SOURCES += pci_for_each_dev.c
-libpci_a_SOURCES += pci_for_each_child.c
-libpci_a_SOURCES += pci_get_dev.c
-libpci_a_SOURCES += pci_irq.c
-libpci_a_SOURCES += pci_print.c
-
-# Driver manager PCI bus
-libpci_a_SOURCES += pci_bus.c
-endif
-
-include $(top_srcdir)/automake/local.am

cpukit/wrapup/Makefile.am

@@ -56,10 +56,6 @@ endif
 TMP_LIBS += ../libmisc/libuuid.a
 TMP_LIBS += ../libmisc/libxz.a
 
-if LIBPCI
-TMP_LIBS += ../libpci/libpci.a
-endif
-
 if LIBNETWORKING
 TMP_LIBS += ../libnetworking/libnetworking.a
 TMP_LIBS += ../librpc/librpc.a