From 48558241757117a61c98df483cd040149a19e382 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 16 Jan 2003 02:58:35 +0000 Subject: 2003-01-15 Ralf Corsepius * wrapup/Makefile.am: Don't include @RTEMS_BSP@.cfg. * pppd/Makefile.am: Don't include @RTEMS_BSP@.cfg. Eliminate *_O_FILES. * rtems_servers/Makefile.am: Ditto. * rtems_webserver/Makefile.am: Ditto. * rtems_telnetd/Makefile.am: Ditto. --- c/src/libnetworking/ChangeLog | 9 +++++++++ c/src/libnetworking/pppd/Makefile.am | 9 +-------- c/src/libnetworking/rtems_servers/Makefile.am | 6 +----- c/src/libnetworking/rtems_telnetd/Makefile.am | 6 +----- c/src/libnetworking/rtems_webserver/Makefile.am | 6 +----- c/src/libnetworking/wrapup/Makefile.am | 1 - cpukit/ftpd/Makefile.am | 6 +----- cpukit/httpd/Makefile.am | 6 +----- cpukit/pppd/Makefile.am | 9 +-------- cpukit/telnetd/Makefile.am | 6 +----- 10 files changed, 17 insertions(+), 47 deletions(-) diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog index 336f12decd..b073459f9d 100644 --- a/c/src/libnetworking/ChangeLog +++ b/c/src/libnetworking/ChangeLog @@ -1,3 +1,12 @@ +2003-01-15 Ralf Corsepius + + * wrapup/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * pppd/Makefile.am: Don't include @RTEMS_BSP@.cfg. + Eliminate *_O_FILES. + * rtems_servers/Makefile.am: Ditto. + * rtems_webserver/Makefile.am: Ditto. + * rtems_telnetd/Makefile.am: Ditto. + 2002-11-04 Joel Sherrill * pppd/auth.c, rtems_webserver/uemf.h: Removed warnings. diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am index e6ee58a2c7..b77fe30e4a 100644 --- a/c/src/libnetworking/pppd/Makefile.am +++ b/c/src/libnetworking/pppd/Makefile.am @@ -2,21 +2,14 @@ ## $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 -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am index 0c83936d58..9748f0af2c 100644 --- a/c/src/libnetworking/rtems_servers/Makefile.am +++ b/c/src/libnetworking/rtems_servers/Makefile.am @@ -2,18 +2,14 @@ ## $Id$ ## - include_rtemsdir = $(includedir)/rtems LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) C_FILES = ftpd.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/c/src/libnetworking/rtems_telnetd/Makefile.am b/c/src/libnetworking/rtems_telnetd/Makefile.am index 5b644b1e08..d03d4272d5 100644 --- a/c/src/libnetworking/rtems_telnetd/Makefile.am +++ b/c/src/libnetworking/rtems_telnetd/Makefile.am @@ -2,20 +2,16 @@ ## $Id$ ## - include_rtemsdir = $(includedir)/rtems LIBNAME = libtelnetd-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = pty.c telnetd.c icmds.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = pty.h telnetd.h -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am index f3f9652122..7d84302064 100644 --- a/c/src/libnetworking/rtems_webserver/Makefile.am +++ b/c/src/libnetworking/rtems_webserver/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - include_goaheaddir = $(includedir)/goahead LIBNAME = lib.a @@ -12,13 +11,10 @@ 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 -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h wsIntrn.h -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am index 3d3f9294f6..712033e552 100644 --- a/c/src/libnetworking/wrapup/Makefile.am +++ b/c/src/libnetworking/wrapup/Makefile.am @@ -12,7 +12,6 @@ NET_O_PIECES = rtems_servers \ OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libnetapps.a -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am index 0c83936d58..9748f0af2c 100644 --- a/cpukit/ftpd/Makefile.am +++ b/cpukit/ftpd/Makefile.am @@ -2,18 +2,14 @@ ## $Id$ ## - include_rtemsdir = $(includedir)/rtems LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) C_FILES = ftpd.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am index f3f9652122..7d84302064 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - include_goaheaddir = $(includedir)/goahead LIBNAME = lib.a @@ -12,13 +11,10 @@ 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 -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h wsIntrn.h -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am index e6ee58a2c7..b77fe30e4a 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -2,21 +2,14 @@ ## $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 -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am index 5b644b1e08..d03d4272d5 100644 --- a/cpukit/telnetd/Makefile.am +++ b/cpukit/telnetd/Makefile.am @@ -2,20 +2,16 @@ ## $Id$ ## - include_rtemsdir = $(includedir)/rtems LIBNAME = libtelnetd-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = pty.c telnetd.c icmds.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = pty.h telnetd.h -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -- cgit v1.2.3