[PATCH 15/31] build: Merge libi2c/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am        | 2 +-
 cpukit/configure.ac       | 1 -
 cpukit/libi2c/Makefile.am | 7 -------
 cpukit/wrapup/Makefile.am | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 cpukit/libi2c/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 5b8a53a8c5..e39d68cb54 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -361,6 +361,7 @@ libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-file.c
 libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-utils.c
 libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-shell.c
 libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-trace.c
+libcpukit_a_SOURCES += libi2c/libi2c.c
 libcpukit_a_SOURCES += sapi/src/chainappendnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetwait.c
@@ -533,7 +534,6 @@ all-local: generate-vc-key
 _SUBDIRS = . score rtems posix
 _SUBDIRS += libnetworking librpc
 _SUBDIRS += libpci
-_SUBDIRS += libi2c
 _SUBDIRS += libmisc
 _SUBDIRS += libmd
 _SUBDIRS += libstdthreads
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 7d93780fb2..38b677b21e 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -501,7 +501,6 @@ libnetworking/Makefile
 libpci/Makefile
 librpc/Makefile
 libmisc/Makefile
-libi2c/Makefile
 libmd/Makefile
 libstdthreads/Makefile
 zlib/Makefile
diff --git a/cpukit/libi2c/Makefile.am b/cpukit/libi2c/Makefile.am
deleted file mode 100644
index 241cf271be..0000000000
--- a/cpukit/libi2c/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-noinst_LIBRARIES = libi2c.a
-
-libi2c_a_SOURCES = libi2c.c libi2c.h
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 84ebb7dd95..6aeb657f83 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -55,7 +55,6 @@ endif
 
 TMP_LIBS += ../libmisc/libuuid.a
 TMP_LIBS += ../libmisc/libxz.a
-TMP_LIBS += ../libi2c/libi2c.a
 
 if LIBPCI
 TMP_LIBS += ../libpci/libpci.a
-- 
2.16.4