From 633456e9200c909c9aad6ab7fae50b70b829999d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 15 Jan 2004 03:47:28 +0000 Subject: 2004-01-15 Ralf Corsepius * Makefile.am: Remove wrapup. * pppd/Makefile.am: Build libpppd. Use automake-compilation rules. * rtems_servers/Makefile.am: Build libftpd. Use automake-compilation rules. * rtems_telnetd/Makefile.am: Build libtelnetd. Use automake-compilation rules. * rtems_webserver/Makefile.am: Build libhttpd. Use automake-compilation rules. * wrapup/Makefile.am: Remove (Unused). --- c/src/libnetworking/ChangeLog | 13 ++++++++ c/src/libnetworking/Makefile.am | 2 +- c/src/libnetworking/pppd/Makefile.am | 40 +++++++++++------------ c/src/libnetworking/rtems_servers/Makefile.am | 37 ++++++++-------------- c/src/libnetworking/rtems_telnetd/Makefile.am | 30 +++++++++--------- c/src/libnetworking/rtems_webserver/Makefile.am | 42 +++++++++++-------------- c/src/libnetworking/wrapup/.cvsignore | 2 -- c/src/libnetworking/wrapup/Makefile.am | 23 -------------- cpukit/ftpd/Makefile.am | 37 ++++++++-------------- cpukit/httpd/Makefile.am | 42 +++++++++++-------------- cpukit/pppd/Makefile.am | 40 +++++++++++------------ cpukit/telnetd/Makefile.am | 30 +++++++++--------- 12 files changed, 146 insertions(+), 192 deletions(-) delete mode 100644 c/src/libnetworking/wrapup/.cvsignore delete mode 100644 c/src/libnetworking/wrapup/Makefile.am diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog index 0c998d27ad..6fbb08413f 100644 --- a/c/src/libnetworking/ChangeLog +++ b/c/src/libnetworking/ChangeLog @@ -1,3 +1,16 @@ +2004-01-15 Ralf Corsepius + + * Makefile.am: Remove wrapup. + * pppd/Makefile.am: Build libpppd. + Use automake-compilation rules. + * rtems_servers/Makefile.am: Build libftpd. + Use automake-compilation rules. + * rtems_telnetd/Makefile.am: Build libtelnetd. + Use automake-compilation rules. + * rtems_webserver/Makefile.am: Build libhttpd. + Use automake-compilation rules. + * wrapup/Makefile.am: Remove (Unused). + 2004-01-14 Ralf Corsepius * pppd/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am index 48ac66d518..e7c3510659 100644 --- a/c/src/libnetworking/Makefile.am +++ b/c/src/libnetworking/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -SUBDIRS = rtems_servers pppd rtems_telnetd rtems_webserver wrapup +SUBDIRS = rtems_servers pppd rtems_telnetd rtems_webserver include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am index 16e39017ae..38cc50908f 100644 --- a/c/src/libnetworking/pppd/Makefile.am +++ b/c/src/libnetworking/pppd/Makefile.am @@ -2,37 +2,35 @@ ## $Id$ ## -LIBNAME = lib.a -LIB = $(ARCH)/$(LIBNAME) - -C_FILES = 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 -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# Add local stuff here using += -# +CLEANFILES = +EXTRA_LIBRARIES = if HAS_NETWORKING include_HEADERS = rtemspppd.h rtemsdialer.h -$(LIB): $(OBJS) - $(make-library) +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 +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) -all-local: $(PREINSTALL_FILES) $(LIB) +noinst_DATA = libpppd$(LIB_VARIANT).a endif -.PRECIOUS: $(LIB) +# 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 = 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 ipxcp.c ipxcp.h lcp.c lcp.h magic.c \ - magic.h md4.c md4.h md5.c md5.h options.c patchlevel.h pathnames.h \ - pppd.h rtemsdialer.h rtemsmain.c rtemspppd.c rtemspppd.h sys-rtems.c \ - upap.c upap.h utils.c +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -51,6 +49,6 @@ $(PROJECT_INCLUDE)/rtemsdialer.h: rtemsdialer.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtemsdialer.h endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am index 6a44be0292..da2f6340cf 100644 --- a/c/src/libnetworking/rtems_servers/Makefile.am +++ b/c/src/libnetworking/rtems_servers/Makefile.am @@ -2,35 +2,29 @@ ## $Id$ ## -LIBNAME = lib.a -LIB = $(ARCH)/$(LIBNAME) - -C_FILES = ftpd.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# Add local stuff here using += -# - -EXTRA_DIST = ftpd.c ftpd.h +CLEANFILES = +EXTRA_LIBRARIES = if HAS_NETWORKING -include_rtemsdir = $(includedir)/rtems - include_HEADERS = ftpd.h -include_rtems_HEADERS = +EXTRA_LIBRARIES += libftpd.a +CLEANFILES += libftpd.a +libftpd_a_SOURCES = ftpd.c ftpd.h +libftpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -$(LIB): $(OBJS) - $(make-library) +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) -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) +noinst_DATA = libftpd$(LIB_VARIANT).a endif -.PRECIOUS: $(LIB) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -40,16 +34,11 @@ $(PROJECT_INCLUDE)/$(dirstamp): PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) if HAS_NETWORKING -$(PROJECT_INCLUDE)/rtems/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/rtems - @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(PROJECT_INCLUDE)/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ftpd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/ftpd.h endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/c/src/libnetworking/rtems_telnetd/Makefile.am b/c/src/libnetworking/rtems_telnetd/Makefile.am index 7e3cab5477..ec7abddaba 100644 --- a/c/src/libnetworking/rtems_telnetd/Makefile.am +++ b/c/src/libnetworking/rtems_telnetd/Makefile.am @@ -2,32 +2,32 @@ ## $Id$ ## -LIBNAME = libtelnetd-tmp -LIB = $(ARCH)/$(LIBNAME).a - -C_FILES = pty.c telnetd.c icmds.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# (OPTIONAL) Add local stuff here using += -# +EXTRA_LIBRARIES = +CLEANFILES = if HAS_NETWORKING include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = pty.h telnetd.h -$(LIB): $(OBJS) - $(make-library) +EXTRA_LIBRARIES += libtelnetd.a +CLEANFILES += 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) -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) +noinst_DATA = libtelnetd$(LIB_VARIANT).a endif -.PRECIOUS: $(LIB) +EXTRA_DIST = README -EXTRA_DIST = README pty.c telnetd.c pty.h icmds.c telnetd.h +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -46,6 +46,6 @@ $(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) include $(top_srcdir)/automake/local.am diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am index 129382ee95..85c24a4ac7 100644 --- a/c/src/libnetworking/rtems_webserver/Makefile.am +++ b/c/src/libnetworking/rtems_webserver/Makefile.am @@ -2,27 +2,14 @@ ## $Id$ ## -LIBNAME = lib.a -LIB = $(ARCH)/$(LIBNAME) - -C_FILES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c form.c h.c \ - handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c sock.c \ - socket.c sym.c uemf.c um.c url.c value.c wbase64.c webrom.c webs.c \ - websuemf.c webmain.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# Add local stuff here using += -# +EXTRA_LIBRARIES = +CLEANFILES = AM_CPPFLAGS += -DWEBS -DUEMF -DOS="RTEMS" -$(LIB): $(OBJS) - $(make-library) - if HAS_NETWORKING if HAS_POSIX include_goaheaddir = $(includedir)/goahead @@ -31,17 +18,26 @@ include_HEADERS = rtems_webserver.h include_goahead_HEADERS = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h \ wsIntrn.h -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) +EXTRA_LIBRARIES += libhttpd.a +CLEANFILES += libhttpd.a +libhttpd_a_SOURCES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c \ + form.c h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c \ + security.c sock.c socket.c sym.c uemf.c um.c url.c value.c wbase64.c \ + webrom.c webs.c websuemf.c webmain.c +libhttpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) + +EXTRA_LIBRARIES += libhttpd_g.a +CLEANFILES += libhttpd_g.a +libhttpd_g_a_SOURCES = $(libhttpd_a_SOURCES) +libhttpd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) + +noinst_DATA = libhttpd$(LIB_VARIANT).a endif endif -.PRECIOUS: $(LIB) +all-local: $(PREINSTALL_FILES) -EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \ - handler.c mime.c misc.c ringq.c rom.c rtems_webserver.h security.c \ - sock.c socket.c sym.c uemf.c uemf.h um.h url.c value.c wbase64.c \ - webcomp.c webmain.c webpage.c webrom.c webs.c webs.h websuemf.c \ - wsIntrn.h +EXTRA_DIST = webcomp.c webpage.c PREINSTALL_FILES = @@ -95,6 +91,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/wsIntrn.h endif endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/c/src/libnetworking/wrapup/.cvsignore b/c/src/libnetworking/wrapup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/libnetworking/wrapup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am deleted file mode 100644 index 2b63b31760..0000000000 --- a/c/src/libnetworking/wrapup/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - -if HAS_POSIX -POSIX_PIECES = rtems_webserver -endif - -NET_O_PIECES = rtems_servers rtems_telnetd pppd $(POSIX_PIECES) -OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) -LIB = $(ARCH)/libnetapps.a - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -if HAS_NETWORKING -$(LIB): $(OBJS) - $(make-library) - -all-local: $(OBJS) $(LIB) -endif - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am index 6a44be0292..da2f6340cf 100644 --- a/cpukit/ftpd/Makefile.am +++ b/cpukit/ftpd/Makefile.am @@ -2,35 +2,29 @@ ## $Id$ ## -LIBNAME = lib.a -LIB = $(ARCH)/$(LIBNAME) - -C_FILES = ftpd.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# Add local stuff here using += -# - -EXTRA_DIST = ftpd.c ftpd.h +CLEANFILES = +EXTRA_LIBRARIES = if HAS_NETWORKING -include_rtemsdir = $(includedir)/rtems - include_HEADERS = ftpd.h -include_rtems_HEADERS = +EXTRA_LIBRARIES += libftpd.a +CLEANFILES += libftpd.a +libftpd_a_SOURCES = ftpd.c ftpd.h +libftpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -$(LIB): $(OBJS) - $(make-library) +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) -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) +noinst_DATA = libftpd$(LIB_VARIANT).a endif -.PRECIOUS: $(LIB) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -40,16 +34,11 @@ $(PROJECT_INCLUDE)/$(dirstamp): PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) if HAS_NETWORKING -$(PROJECT_INCLUDE)/rtems/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/rtems - @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(PROJECT_INCLUDE)/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ftpd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/ftpd.h endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am index 129382ee95..85c24a4ac7 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -2,27 +2,14 @@ ## $Id$ ## -LIBNAME = lib.a -LIB = $(ARCH)/$(LIBNAME) - -C_FILES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c form.c h.c \ - handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c sock.c \ - socket.c sym.c uemf.c um.c url.c value.c wbase64.c webrom.c webs.c \ - websuemf.c webmain.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# Add local stuff here using += -# +EXTRA_LIBRARIES = +CLEANFILES = AM_CPPFLAGS += -DWEBS -DUEMF -DOS="RTEMS" -$(LIB): $(OBJS) - $(make-library) - if HAS_NETWORKING if HAS_POSIX include_goaheaddir = $(includedir)/goahead @@ -31,17 +18,26 @@ include_HEADERS = rtems_webserver.h include_goahead_HEADERS = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h \ wsIntrn.h -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) +EXTRA_LIBRARIES += libhttpd.a +CLEANFILES += libhttpd.a +libhttpd_a_SOURCES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c \ + form.c h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c \ + security.c sock.c socket.c sym.c uemf.c um.c url.c value.c wbase64.c \ + webrom.c webs.c websuemf.c webmain.c +libhttpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) + +EXTRA_LIBRARIES += libhttpd_g.a +CLEANFILES += libhttpd_g.a +libhttpd_g_a_SOURCES = $(libhttpd_a_SOURCES) +libhttpd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) + +noinst_DATA = libhttpd$(LIB_VARIANT).a endif endif -.PRECIOUS: $(LIB) +all-local: $(PREINSTALL_FILES) -EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \ - handler.c mime.c misc.c ringq.c rom.c rtems_webserver.h security.c \ - sock.c socket.c sym.c uemf.c uemf.h um.h url.c value.c wbase64.c \ - webcomp.c webmain.c webpage.c webrom.c webs.c webs.h websuemf.c \ - wsIntrn.h +EXTRA_DIST = webcomp.c webpage.c PREINSTALL_FILES = @@ -95,6 +91,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/wsIntrn.h endif endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am index 16e39017ae..38cc50908f 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -2,37 +2,35 @@ ## $Id$ ## -LIBNAME = lib.a -LIB = $(ARCH)/$(LIBNAME) - -C_FILES = 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 -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# Add local stuff here using += -# +CLEANFILES = +EXTRA_LIBRARIES = if HAS_NETWORKING include_HEADERS = rtemspppd.h rtemsdialer.h -$(LIB): $(OBJS) - $(make-library) +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 +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) -all-local: $(PREINSTALL_FILES) $(LIB) +noinst_DATA = libpppd$(LIB_VARIANT).a endif -.PRECIOUS: $(LIB) +# 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 = 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 ipxcp.c ipxcp.h lcp.c lcp.h magic.c \ - magic.h md4.c md4.h md5.c md5.h options.c patchlevel.h pathnames.h \ - pppd.h rtemsdialer.h rtemsmain.c rtemspppd.c rtemspppd.h sys-rtems.c \ - upap.c upap.h utils.c +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -51,6 +49,6 @@ $(PROJECT_INCLUDE)/rtemsdialer.h: rtemsdialer.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtemsdialer.h endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am index 7e3cab5477..ec7abddaba 100644 --- a/cpukit/telnetd/Makefile.am +++ b/cpukit/telnetd/Makefile.am @@ -2,32 +2,32 @@ ## $Id$ ## -LIBNAME = libtelnetd-tmp -LIB = $(ARCH)/$(LIBNAME).a - -C_FILES = pty.c telnetd.c icmds.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -# -# (OPTIONAL) Add local stuff here using += -# +EXTRA_LIBRARIES = +CLEANFILES = if HAS_NETWORKING include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = pty.h telnetd.h -$(LIB): $(OBJS) - $(make-library) +EXTRA_LIBRARIES += libtelnetd.a +CLEANFILES += 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) -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) +noinst_DATA = libtelnetd$(LIB_VARIANT).a endif -.PRECIOUS: $(LIB) +EXTRA_DIST = README -EXTRA_DIST = README pty.c telnetd.c pty.h icmds.c telnetd.h +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -46,6 +46,6 @@ $(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) include $(top_srcdir)/automake/local.am -- cgit v1.2.3