[PATCH 12/25] Merge dev/Makefile.am into cpukit/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am        | 15 ++++++++++++++-
 cpukit/configure.ac       |  1 -
 cpukit/dev/Makefile.am    | 23 -----------------------
 cpukit/wrapup/Makefile.am |  1 -
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 cpukit/dev/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 996aac872f..6a01fc6d89 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -6,6 +6,20 @@ include $(top_srcdir)/automake/multilib.am
 noinst_LIBRARIES = libcpukit.a
 
 libcpukit_a_SOURCES =
+libcpukit_a_SOURCES += dev/i2c/eeprom.c
+libcpukit_a_SOURCES += dev/i2c/fpga-i2c-slave.c
+libcpukit_a_SOURCES += dev/i2c/gpio-nxp-pca9535.c
+libcpukit_a_SOURCES += dev/i2c/i2c-bus.c
+libcpukit_a_SOURCES += dev/i2c/i2c-dev.c
+libcpukit_a_SOURCES += dev/i2c/sensor-lm75a.c
+libcpukit_a_SOURCES += dev/i2c/switch-nxp-pca9548a.c
+libcpukit_a_SOURCES += dev/i2c/ti-ads-16bit-adc.c
+libcpukit_a_SOURCES += dev/i2c/ti-lm25066a.c
+libcpukit_a_SOURCES += dev/i2c/ti-tmp112.c
+libcpukit_a_SOURCES += dev/i2c/xilinx-axi-i2c.c
+libcpukit_a_SOURCES += dev/serial/sc16is752.c
+libcpukit_a_SOURCES += dev/serial/sc16is752-spi.c
+libcpukit_a_SOURCES += dev/spi/spi-bus.c
 libcpukit_a_SOURCES += sapi/src/chainappendnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetwait.c
@@ -82,7 +96,6 @@ wrapup: $(builddir)/libcpukit.a
 
 # librtemscpu
 _SUBDIRS = . score rtems posix
-_SUBDIRS += dev
 _SUBDIRS += dtc/libfdt
 _SUBDIRS += libcrypt
 _SUBDIRS += libcsupport libblock libfs
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 782ed50a2e..e45114f6ab 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -474,7 +474,6 @@ RTEMS_AMPOLISH3
 AC_CONFIG_FILES([
 Doxyfile
 Makefile
-dev/Makefile
 dtc/libfdt/Makefile
 rtems/Makefile
 score/Makefile
diff --git a/cpukit/dev/Makefile.am b/cpukit/dev/Makefile.am
deleted file mode 100644
index f499bbb948..0000000000
--- a/cpukit/dev/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-include $(top_srcdir)/automake/multilib.am
-
-noinst_LIBRARIES = libdev.a
-
-libdev_a_SOURCES =
-libdev_a_SOURCES += i2c/eeprom.c
-libdev_a_SOURCES += i2c/fpga-i2c-slave.c
-libdev_a_SOURCES += i2c/gpio-nxp-pca9535.c
-libdev_a_SOURCES += i2c/i2c-bus.c
-libdev_a_SOURCES += i2c/i2c-dev.c
-libdev_a_SOURCES += i2c/sensor-lm75a.c
-libdev_a_SOURCES += i2c/switch-nxp-pca9548a.c
-libdev_a_SOURCES += i2c/xilinx-axi-i2c.c
-libdev_a_SOURCES += i2c/ti-ads-16bit-adc.c
-libdev_a_SOURCES += i2c/ti-lm25066a.c
-libdev_a_SOURCES += i2c/ti-tmp112.c
-libdev_a_SOURCES += spi/spi-bus.c
-libdev_a_SOURCES += serial/sc16is752.c
-libdev_a_SOURCES += serial/sc16is752-spi.c
-libdev_a_SOURCES += serial/sc16is752-regs.h
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 9555153d64..a24550da5a 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -13,7 +13,6 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/librtemscpu.a
 librtemscpu_a_SOURCES =
 
 TMP_LIBS =
-TMP_LIBS += ../dev/libdev.a
 TMP_LIBS += ../dtc/libfdt/libfdt.a
 TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a
 TMP_LIBS += ../score/libscore.a
-- 
2.13.7