[PATCH 25/31] build: Merge telnetd/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am         | 14 +++++++++++++-
 cpukit/configure.ac        |  1 -
 cpukit/telnetd/Makefile.am | 13 -------------
 3 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 cpukit/telnetd/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index b2705c6ed9..8b3c5938ca 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1223,7 +1223,6 @@ _SUBDIRS += wrapup
 
 # other libraries
 _SUBDIRS += zlib
-_SUBDIRS += telnetd
 
 project_lib_LIBRARIES += libftpd.a
 
@@ -1235,6 +1234,19 @@ libftpd_a_SOURCES =
 libftpd_a_SOURCES += ftpd/ftpd.c
 libftpd_a_SOURCES += ftpd/ftpd-init.c
 
+project_lib_LIBRARIES += libtelnetd.a
+
+$(PROJECT_LIB)/libtelnetd.a: libtelnetd.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libtelnetd.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libtelnetd.a
+
+libtelnetd_a_SOURCES =
+libtelnetd_a_SOURCES += telnetd/check_passwd.c
+libtelnetd_a_SOURCES += telnetd/des.c
+libtelnetd_a_SOURCES += telnetd/pty.c
+libtelnetd_a_SOURCES += telnetd/telnetd.c
+libtelnetd_a_SOURCES += telnetd/telnetd-init.c
+
 if LIBDEBUGGER
 
 project_lib_LIBRARIES += libdebugger.a
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 1d95926cb5..7f378d65ca 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -498,7 +498,6 @@ score/cpu/no_cpu/Makefile
 libnetworking/Makefile
 libmisc/Makefile
 zlib/Makefile
-telnetd/Makefile
 wrapup/Makefile])
 
 AC_OUTPUT
diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am
deleted file mode 100644
index 7d9e543e67..0000000000
--- a/cpukit/telnetd/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-if LIBSHELL
-project_lib_LIBRARIES = libtelnetd.a
-
-$(PROJECT_LIB)/libtelnetd.a: libtelnetd.a
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libtelnetd.a
-TMPINSTALL_FILES = $(PROJECT_LIB)/libtelnetd.a
-
-libtelnetd_a_SOURCES = check_passwd.c des.c pty.c telnetd.c telnetd-init.c
-endif
-
-include $(top_srcdir)/automake/local.am
-- 
2.16.4