[PATCH 20/25] Merge libdrvmgr/Make*.am into cpukit/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am           | 24 +++++++++++++++++++++++-
 cpukit/configure.ac          |  1 -
 cpukit/libdrvmgr/Makefile.am | 32 --------------------------------
 cpukit/wrapup/Makefile.am    |  4 ----
 4 files changed, 23 insertions(+), 38 deletions(-)
 delete mode 100644 cpukit/libdrvmgr/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 1a8c66b66a..25253a29e0 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -327,6 +327,29 @@ libcpukit_a_SOURCES += libdl/rtl-unwind-dw2.c
 
 endif
 
+if LIBDRVMGR
+
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_by_id.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_by_name.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_dev_by_name.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_drvinf.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_for_each_dev.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_for_each_list_dev.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_func.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_func_call.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_init.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_list.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_lock.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_print.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_res.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_rw.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_translate.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_translate_check.c
+libcpukit_a_SOURCES += libdrvmgr/drvmgr_unregister.c
+
+endif
+
 #
 # Create a new Version VC Key header if the VC state has changed.
 #
@@ -366,7 +389,6 @@ wrapup: $(builddir)/libcpukit.a
 # librtemscpu
 _SUBDIRS = . score rtems posix
 _SUBDIRS += libfs
-_SUBDIRS += libdrvmgr
 _SUBDIRS += libnetworking librpc
 _SUBDIRS += libpci
 _SUBDIRS += libi2c
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index cdf162150f..f02474fa4d 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -497,7 +497,6 @@ score/cpu/v850/Makefile
 score/cpu/x86_64/Makefile
 score/cpu/no_cpu/Makefile
 posix/Makefile
-libdrvmgr/Makefile
 libfs/Makefile
 libfs/src/nfsclient/Makefile
 libgnat/Makefile
diff --git a/cpukit/libdrvmgr/Makefile.am b/cpukit/libdrvmgr/Makefile.am
deleted file mode 100644
index 3d614bb311..0000000000
--- a/cpukit/libdrvmgr/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-if LIBDRVMGR
-
-
-noinst_LIBRARIES = libdrvmgr.a
-
-libdrvmgr_a_SOURCES = drvmgr.c
-libdrvmgr_a_SOURCES += drvmgr.h
-libdrvmgr_a_SOURCES += drvmgr_by_name.c
-libdrvmgr_a_SOURCES += drvmgr_by_id.c
-libdrvmgr_a_SOURCES += drvmgr_dev_by_name.c
-libdrvmgr_a_SOURCES += drvmgr_drvinf.c
-libdrvmgr_a_SOURCES += drvmgr_init.c
-libdrvmgr_a_SOURCES += drvmgr_confdefs.h
-libdrvmgr_a_SOURCES += drvmgr_for_each_dev.c
-libdrvmgr_a_SOURCES += drvmgr_for_each_list_dev.c
-libdrvmgr_a_SOURCES += drvmgr_func.c
-libdrvmgr_a_SOURCES += drvmgr_func_call.c
-libdrvmgr_a_SOURCES += drvmgr_list.c
-libdrvmgr_a_SOURCES += drvmgr_list.h
-libdrvmgr_a_SOURCES += drvmgr_lock.c
-libdrvmgr_a_SOURCES += drvmgr_print.c
-libdrvmgr_a_SOURCES += drvmgr_res.c
-libdrvmgr_a_SOURCES += drvmgr_rw.c
-libdrvmgr_a_SOURCES += drvmgr_translate.c
-libdrvmgr_a_SOURCES += drvmgr_translate_check.c
-libdrvmgr_a_SOURCES += drvmgr_unregister.c
-
-endif
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 1335b5bfce..7bf5cae9dd 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -72,10 +72,6 @@ if LIBPCI
 TMP_LIBS += ../libpci/libpci.a
 endif
 
-if LIBDRVMGR
-TMP_LIBS += ../libdrvmgr/libdrvmgr.a
-endif
-
 if LIBNETWORKING
 TMP_LIBS += ../libnetworking/libnetworking.a
 TMP_LIBS += ../librpc/librpc.a
-- 
2.13.7