From 44213adda5068a7de678254c1df7500c46ae1f9c Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 2 Jan 2005 00:54:34 +0000
Subject: 2005-01-01	Ralf Corsepius <ralf.corsepius@rtems.org>

	* libnetworking/pppd/Makefile.am,
	libnetworking/rtems_servers/Makefile.am,
	libnetworking/rtems_telnetd/Makefile.am:
	Remove build-variant support.
---
 cpukit/ftpd/Makefile.am    | 15 +++------------
 cpukit/pppd/Makefile.am    | 25 ++++++++-----------------
 cpukit/telnetd/Makefile.am | 15 +++------------
 3 files changed, 14 insertions(+), 41 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 39ce900b9e..ce67fa67fa 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -4,23 +4,14 @@
 
 include $(top_srcdir)/automake/compile.am
 
-CLEANFILES =
-EXTRA_LIBRARIES =
+noinst_LIBRARIES =
 
 if HAS_NETWORKING
 include_HEADERS = ftpd.h
 
-EXTRA_LIBRARIES += libftpd.a
-CLEANFILES += libftpd.a
+noinst_LIBRARIES += libftpd.a
 libftpd_a_SOURCES = ftpd.c ftpd.h
 libftpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += libftpd_g.a
-CLEANFILES += libftpd_g.a
-libftpd_g_a_SOURCES = $(libftpd_a_SOURCES)
-libftpd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-
-noinst_DATA = libftpd$(LIB_VARIANT).a
 endif
 
 all-local: $(PREINSTALL_FILES)
@@ -39,7 +30,7 @@ $(PROJECT_INCLUDE)/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/ftpd.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index 0e278677f3..f7caca13a7 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -4,30 +4,21 @@
 
 include $(top_srcdir)/automake/compile.am
 
-CLEANFILES =
-EXTRA_LIBRARIES =
+noinst_LIBRARIES =
 
 if HAS_NETWORKING
 include_HEADERS = rtemspppd.h rtemsdialer.h
 
-EXTRA_LIBRARIES += libpppd.a
-CLEANFILES += libpppd.a
-libpppd_a_SOURCES = auth.c ccp.c chap.c chap_ms.c chat.c demand.c fsm.c \
-    ipcp.c lcp.c magic.c options.c upap.c md4.c md5.c utils.c sys-rtems.c \
-    rtemsmain.c rtemspppd.c
+noinst_LIBRARIES += 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 md4.c md4.h md5.c md5.h utils.c sys-rtems.c \
+    rtemsmain.c rtemspppd.c pppd.h patchlevel.h pathnames.h
 libpppd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += libpppd_g.a
-CLEANFILES += libpppd_g.a
-libpppd_g_a_SOURCES = $(libpppd_a_SOURCES)
-libpppd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-
-noinst_DATA = libpppd$(LIB_VARIANT).a
 endif
 
 # FIXME: Move sources to libpppd_a_SOURCES, remove other files.
-EXTRA_DIST = ccp.h chap.h chap_ms.h fsm.h ipcp.h ipxcp.c ipxcp.h lcp.c lcp.h \
-    magic.h md4.h md5.h patchlevel.h pathnames.h pppd.h upap.h
+EXTRA_DIST = ipxcp.c ipxcp.h
 
 all-local: $(PREINSTALL_FILES)
 
@@ -49,7 +40,7 @@ $(PROJECT_INCLUDE)/rtemsdialer.h: rtemsdialer.h $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtemsdialer.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am
index 99deb79186..ec975a983a 100644
--- a/cpukit/telnetd/Makefile.am
+++ b/cpukit/telnetd/Makefile.am
@@ -4,24 +4,15 @@
 
 include $(top_srcdir)/automake/compile.am
 
-EXTRA_LIBRARIES =
-CLEANFILES =
+noinst_LIBRARIES =
 
 if HAS_NETWORKING
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = pty.h telnetd.h
 
-EXTRA_LIBRARIES += libtelnetd.a
-CLEANFILES += libtelnetd.a
+noinst_LIBRARIES += libtelnetd.a
 libtelnetd_a_SOURCES = pty.c pty.h telnetd.c telnetd.h icmds.c
 libtelnetd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += libtelnetd_g.a
-CLEANFILES += libtelnetd_g.a
-libtelnetd_g_a_SOURCES = $(libtelnetd_a_SOURCES)
-libtelnetd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-
-noinst_DATA = libtelnetd$(LIB_VARIANT).a
 endif
 
 EXTRA_DIST = README
@@ -46,7 +37,7 @@ $(PROJECT_INCLUDE)/rtems/telnetd.h: telnetd.h $(PROJECT_INCLUDE)/rtems/$(dirstam
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/telnetd.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3