Patches rtems-rc-20000118-7.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that contains the automake files for libnetworking plus a couple of
minor fixes.  [Now only one unused/unsupported Makefile.in remains
(./c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in).]

    To apply:
        patch -p1 < rtems-rc-20000118-7.diff
        /bin/sh rtems-rc-20000118-7.rm
        /bin/sh rtems-rc-20000118-7.add
        ./bootstrap

    Notes:
    * I have tested this one by building all BSPs for m68k, powerpc, sh and
      unix with toolchains built since last weekend.
    * I did not touch libnetworking's directory layout.

17 files changed, 479 insertions, 79 deletions

diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
new file mode 100644
index 0000000000..77d1677844
--- /dev/null
+++ b/cpukit/ftpd/Makefile.am
@@ -0,0 +1,31 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = ftpd.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = ftpd.c ftpd.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am
new file mode 100644
index 0000000000..3dae7f9676
--- /dev/null
+++ b/cpukit/httpd/Makefile.am
@@ -0,0 +1,41 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = asp.c balloc.c wbase64.c default.c ejlex.c ejparse.c form.c h.c \
+    handler.c mime.c misc.c webpage.c ringq.c rom.c security.c socket.c \
+    sym.c uemf.c url.c value.c webcomp.c webrom.c webs.c websuemf.c \
+    webmain.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -DWEBS -DUEMF -DOS="RTEMS"
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+if HAS_POSIX
+all-local: $(ARCH) $(OBJS) $(LIB)
+endif
+
+.PRECIOUS: $(LIB)
+
+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 \
+    socket.c sym.c uemf.c uemf.h url.c value.c wbase64.c webcomp.c webmain.c \
+    webpage.c webrom.c webs.c webs.h websuemf.c wsIntrn.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/httpd/Makefile.in b/cpukit/httpd/Makefile.in
deleted file mode 100644
index 5285ea204d..0000000000
--- a/cpukit/httpd/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = rtems_webserver
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIBNAME = lib.a
-LIB = ${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES = asp balloc wbase64 default ejlex ejparse form h handler mime misc \
-    webpage ringq rom security socket sym uemf url value webcomp webrom webs \
-    websuemf webmain
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -DWEBS -DUEMF -DOS="RTEMS"
-CPPFLAGS +=
-CFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 3ecfea31bc..ce9cf6c399 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -1,29 +1,15 @@
-##
+## 
 ## $Id$
-##
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-if HAS_POSIX
-POSIX_SUBDIRS = rtems_webserver
-endif
+SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \
+    rtems_servers pppd rtems_webserver wrapup
 
-SUBDIRS = include kern lib libc net netinet nfs rtems rtems_servers \
-pppd $(POSIX_SUBDIRS) wrapup
-
-EXTRA_DIST = \
-CHANGELOG \
-README \
-bpfilter.h \
-loop.h \
-netdb.h \
-opt_ipfw.h \
-opt_mrouting.h \
-opt_tcpdebug.h \
-poll.h \
-resolv.h \
-syslog.h
+EXTRA_DIST = CHANGELOG bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \
+    opt_tcpdebug.h poll.h resolv.h syslog.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/arpa/Makefile.am b/cpukit/libnetworking/arpa/Makefile.am
new file mode 100644
index 0000000000..dba97b83d5
--- /dev/null
+++ b/cpukit/libnetworking/arpa/Makefile.am
@@ -0,0 +1,9 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+EXTRA_DIST = ftp.h inet.h nameser.h nameser_compat.h telnet.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/kern/Makefile.am b/cpukit/libnetworking/kern/Makefile.am
new file mode 100644
index 0000000000..aedc2bbadf
--- /dev/null
+++ b/cpukit/libnetworking/kern/Makefile.am
@@ -0,0 +1,35 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = kern_subr.c uipc_domain.c uipc_mbuf.c uipc_socket.c uipc_socket2.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
+    -DBOOTP_COMPAT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = kern_subr.c uipc_domain.c uipc_mbuf.c uipc_socket.c \
+    uipc_socket2.c
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/lib/Makefile.am b/cpukit/libnetworking/lib/Makefile.am
new file mode 100644
index 0000000000..5f8d151e13
--- /dev/null
+++ b/cpukit/libnetworking/lib/Makefile.am
@@ -0,0 +1,33 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = getprotoby.c rtems_bsdnet_ntp.c syslog.c tftpDriver.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -DNOPOLL -DNOSELECT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = README getprotoby.c rtems_bsdnet_ntp.c syslog.c tftpDriver.c
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/libc/Makefile.am b/cpukit/libnetworking/libc/Makefile.am
new file mode 100644
index 0000000000..57b2b412f2
--- /dev/null
+++ b/cpukit/libnetworking/libc/Makefile.am
@@ -0,0 +1,57 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4 no-installman
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = base64.c gethostbydns.c gethostbyht.c gethostbynis.c \
+    gethostnamadr.c getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
+    getproto.c getprotoent.c getprotoname.c getservbyname.c getservbyport.c \
+    getservent.c herror.c inet_addr.c inet_lnaof.c inet_makeaddr.c \
+    inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c \
+    nsap_addr.c ns_name.c ns_netint.c ns_parse.c ns_print.c ns_ttl.c \
+    res_comp.c res_data.c res_debug.c res_init.c res_mkquery.c \
+    res_mkupdate.c res_query.c res_send.c res_stubs.c res_update.c strsep.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+man_MANS = addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 getnetent.3 \
+    getprotoent.3 getservent.3 inet.3 iso_addr.3 linkaddr.3 ns.3 rcmd.3 \
+    resolver.3
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -DNOPOLL -DNOSELECT
+AM_CPPFLAGS += -U__STRICT_ANSI__
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \
+    ether_addr.c ethers.3 gethostbydns.c gethostbyht.c gethostbyname.3 \
+    gethostbynis.c gethostnamadr.c gethostname.c getnetbydns.c getnetbyht.c \
+    getnetbynis.c getnetent.3 getnetnamadr.c getproto.c getprotoent.3 \
+    getprotoent.c getprotoname.c getservbyname.c getservbyport.c \
+    getservent.3 getservent.c herror.c inet.3 inet_addr.c inet_lnaof.c \
+    inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c inet_netof.c \
+    inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c iso_addr.3 iso_addr.c \
+    linkaddr.3 linkaddr.c map_v4v6.c ns.3 ns_addr.c ns_name.c ns_netint.c \
+    ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c nsap_addr.c rcmd.3 rcmd.c \
+    recv.c res_comp.c res_config.h res_data.c res_debug.c res_init.c \
+    res_mkquery.c res_mkupdate.c res_query.c res_send.c res_stubs.c \
+    res_update.c resolver.3 send.c strsep.c
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/machine/Makefile.am b/cpukit/libnetworking/machine/Makefile.am
new file mode 100644
index 0000000000..11e23bf86c
--- /dev/null
+++ b/cpukit/libnetworking/machine/Makefile.am
@@ -0,0 +1,10 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+EXTRA_DIST = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \
+    types.h vmparam.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am
new file mode 100644
index 0000000000..d965963974
--- /dev/null
+++ b/cpukit/libnetworking/net/Makefile.am
@@ -0,0 +1,37 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = if.c if_ethersubr.c if_loop.c radix.c route.c rtsock.c raw_cb.c \
+    raw_usrreq.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
+    -DBOOTP_COMPAT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = bpf.h ethernet.h if.c if.h if_arp.h if_dl.h if_ethersubr.c \
+    if_llc.h if_loop.c if_ppp.h if_types.h netisr.h ppp-comp.h ppp_defs.h \
+    radix.c radix.h raw_cb.c raw_cb.h raw_usrreq.c route.c route.h rtsock.c
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/netinet/Makefile.am b/cpukit/libnetworking/netinet/Makefile.am
new file mode 100644
index 0000000000..f967b65cd7
--- /dev/null
+++ b/cpukit/libnetworking/netinet/Makefile.am
@@ -0,0 +1,43 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = if_ether.c igmp.c in.c in_cksum.c in_pcb.c in_proto.c in_rmx.c \
+    ip_divert.c ip_fw.c ip_icmp.c ip_input.c ip_mroute.c ip_output.c \
+    raw_ip.c tcp_debug.c tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c \
+    tcp_usrreq.c udp_usrreq.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
+    -DBOOTP_COMPAT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = icmp_var.h if_ether.c if_ether.h igmp.c igmp.h igmp_var.h in.c \
+    in.h in_cksum.c in_cksum_i386.c in_cksum_m68k.c in_cksum_powerpc.c \
+    in_pcb.c in_pcb.h in_proto.c in_rmx.c in_systm.h in_var.h ip.h \
+    ip_divert.c ip_fw.c ip_fw.h ip_icmp.c ip_icmp.h ip_input.c ip_mroute.c \
+    ip_mroute.h ip_output.c ip_var.h raw_ip.c tcp.h tcp_debug.c tcp_debug.h \
+    tcp_fsm.h tcp_input.c tcp_output.c tcp_seq.h tcp_subr.c tcp_timer.c \
+    tcp_timer.h tcp_usrreq.c tcp_var.h tcpip.h udp.h udp_usrreq.c udp_var.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/nfs/Makefile.am b/cpukit/libnetworking/nfs/Makefile.am
new file mode 100644
index 0000000000..51184e47ae
--- /dev/null
+++ b/cpukit/libnetworking/nfs/Makefile.am
@@ -0,0 +1,35 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = bootp_subr.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
+    -DBOOTP_COMPAT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = bootp_subr.c krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h \
+    xdr_subs.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/rtems/Makefile.am b/cpukit/libnetworking/rtems/Makefile.am
new file mode 100644
index 0000000000..28df4629c4
--- /dev/null
+++ b/cpukit/libnetworking/rtems/Makefile.am
@@ -0,0 +1,41 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+C_FILES = sghostname.c issetugid.c rtems_glue.c rtems_syscall.c \
+    rtems_bootp.c rtems_showmbuf.c rtems_showroute.c rtems_showifstat.c \
+    rtems_showipstat.c rtems_showicmpstat.c rtems_showtcpstat.c \
+    rtems_showudpstat.c rtems_select.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
+    -DBOOTP_COMPAT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = issetugid.c rtems_bootp.c rtems_bsdnet.h \
+    rtems_bsdnet_internal.h rtems_glue.c rtems_select.c rtems_showicmpstat.c \
+    rtems_showifstat.c rtems_showipstat.c rtems_showmbuf.c rtems_showroute.c \
+    rtems_showtcpstat.c rtems_showudpstat.c rtems_syscall.c sghostname.c \
+    tftp.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/sys/Makefile.am b/cpukit/libnetworking/sys/Makefile.am
new file mode 100644
index 0000000000..3fe88aff59
--- /dev/null
+++ b/cpukit/libnetworking/sys/Makefile.am
@@ -0,0 +1,13 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+EXTRA_DIST = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
+    ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
+    protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \
+    socket.h socketvar.h sockio.h sysctl.h syslimits.h syslog.h systm.h \
+    ttycom.h ttydefaults.h ucred.h uio.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/vm/Makefile.am b/cpukit/libnetworking/vm/Makefile.am
new file mode 100644
index 0000000000..3f307c7cfb
--- /dev/null
+++ b/cpukit/libnetworking/vm/Makefile.am
@@ -0,0 +1,9 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+EXTRA_DIST = vm.h vm_extern.h vm_kern.h vm_param.h
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/wrapup/Makefile.am b/cpukit/libnetworking/wrapup/Makefile.am
new file mode 100644
index 0000000000..5d2a73a05e
--- /dev/null
+++ b/cpukit/libnetworking/wrapup/Makefile.am
@@ -0,0 +1,35 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+if HAS_POSIX
+POSIX_PIECES = rtems_webserver
+endif 
+
+NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers pppd \
+    $(POSIX_PIECES)
+OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
+LIB = $(ARCH)/libnetworking.a
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(LIB)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
new file mode 100644
index 0000000000..1c860d5a14
--- /dev/null
+++ b/cpukit/pppd/Makefile.am
@@ -0,0 +1,44 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = lib.a
+LIB = $(ARCH)/$(LIBNAME)
+
+# What to do about main.c?
+C_FILES = auth.c cbcp.c ccp.c chap.c chap_ms.c chat.c demand.c fsm.c ipcp.c \
+    ipxcp.c lcp.c magic.c options.c upap.c md4.c md5.c rtems-ppp.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+# DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
+#     -DBOOTP_COMPAT
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+EXTRA_FILES = modem_example/16550.h modem_example/README \
+    modem_example/modem.c modem_example/modem.h modem_example/ppp.c \
+    modem_example/ppp.h modem_example/pppcompress.c
+
+all-local: $(ARCH) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = README STATUS auth.c cbcp.c cbcp.h 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 main.c md4.c md4.h md5.c md5.h \
+    options.c patchlevel.h pathnames.h ppp_tty.c pppd.h rtems-ppp.c upap.c \
+    upap.h $(EXTRA_FILES)
+
+include $(top_srcdir)/../../../automake/local.am