[PATCH 22/31] build: Merge pppd/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am      | 25 ++++++++++++++++++++++++-
 cpukit/configure.ac     |  1 -
 cpukit/pppd/Makefile.am | 17 -----------------
 3 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 cpukit/pppd/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 8ad3f112e1..13ea35a5eb 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -850,7 +850,6 @@ _SUBDIRS += wrapup
 # other libraries
 _SUBDIRS += zlib
 _SUBDIRS += telnetd
-_SUBDIRS += pppd
 
 project_lib_LIBRARIES += libftpd.a
 
@@ -915,6 +914,30 @@ libjffs2_a_CPPFLAGS += -I$(srcdir)/libfs/src/jffs2/include
 
 if LIBNETWORKING
 
+project_lib_LIBRARIES += libpppd.a
+
+$(PROJECT_LIB)/libpppd.a: libpppd.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libpppd.a
+
+libpppd_a_SOURCES =
+libpppd_a_SOURCES += pppd/auth.c
+libpppd_a_SOURCES += pppd/ccp.c
+libpppd_a_SOURCES += pppd/chap.c
+libpppd_a_SOURCES += pppd/chap_ms.c
+libpppd_a_SOURCES += pppd/chat.c
+libpppd_a_SOURCES += pppd/demand.c
+libpppd_a_SOURCES += pppd/fsm.c
+libpppd_a_SOURCES += pppd/ipcp.c
+libpppd_a_SOURCES += pppd/lcp.c
+libpppd_a_SOURCES += pppd/magic.c
+libpppd_a_SOURCES += pppd/options.c
+libpppd_a_SOURCES += pppd/rtemsmain.c
+libpppd_a_SOURCES += pppd/rtemspppd.c
+libpppd_a_SOURCES += pppd/sys-rtems.c
+libpppd_a_SOURCES += pppd/upap.c
+libpppd_a_SOURCES += pppd/utils.c
+
 if HAS_PTHREADS
 
 project_lib_LIBRARIES += libmghttpd.a
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index ac94e6b050..9bd11ff452 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -500,7 +500,6 @@ libnetworking/Makefile
 libmisc/Makefile
 zlib/Makefile
 telnetd/Makefile
-pppd/Makefile
 wrapup/Makefile])
 
 AC_OUTPUT
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
deleted file mode 100644
index 799b2a9556..0000000000
--- a/cpukit/pppd/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-if LIBNETWORKING
-project_lib_LIBRARIES = libpppd.a
-
-$(PROJECT_LIB)/libpppd.a: libpppd.a
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
-TMPINSTALL_FILES = $(PROJECT_LIB)/libpppd.a
-
-libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \
-    chat.c demand.c fsm.c fsm.h ipcp.c ipcp.h lcp.c lcp.h magic.c magic.h \
-    options.c upap.c upap.h utils.c sys-rtems.c \
-    rtemsmain.c rtemspppd.c rtemspppd.h pppd.h patchlevel.h pathnames.h \
-    rtemsdialer.h
-endif
-
-include $(top_srcdir)/automake/local.am
-- 
2.16.4