From 8a79786886d83e0346146bcc36d0ae7b535c723c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 29 May 2002 17:00:59 +0000 Subject: 2002-05-29 Ralf Corsepius Relocate c/src/libnetworking. * Makefile.am: Reflect moval. * machine/Makefile.am: Ditto. * net/Makefile.am: Ditto. * lib/Makefile.am: Ditto. * netinet/Makefile.am: Ditto. * vm/Makefile.am: Ditto. * libc/Makefile.am: Ditto. * sys/Makefile.am: Ditto. * arpa/Makefile.am: Ditto. * nfs/Makefile.am: Ditto. * kern/Makefile.am: Ditto. * rtems/Makefile.am: Ditto. * configure.ac: Dittp. * wrapup/Makefile.am: Ditto. Remove references to networking apps. --- c/src/exec/libnetworking/ChangeLog | 18 ++++++++++++++++++ c/src/exec/libnetworking/Makefile.am | 11 ++++++----- c/src/exec/libnetworking/arpa/Makefile.am | 2 +- c/src/exec/libnetworking/configure.ac | 10 +++------- c/src/exec/libnetworking/kern/Makefile.am | 8 ++++---- c/src/exec/libnetworking/lib/Makefile.am | 8 ++++---- c/src/exec/libnetworking/libc/Makefile.am | 8 ++++---- c/src/exec/libnetworking/machine/Makefile.am | 2 +- c/src/exec/libnetworking/net/Makefile.am | 8 ++++---- c/src/exec/libnetworking/netinet/Makefile.am | 8 ++++---- c/src/exec/libnetworking/nfs/Makefile.am | 8 ++++---- c/src/exec/libnetworking/rtems/Makefile.am | 6 +++--- c/src/exec/libnetworking/sys/Makefile.am | 2 +- c/src/exec/libnetworking/vm/Makefile.am | 2 +- c/src/exec/libnetworking/wrapup/Makefile.am | 15 +++++---------- cpukit/libnetworking/ChangeLog | 18 ++++++++++++++++++ cpukit/libnetworking/Makefile.am | 11 ++++++----- cpukit/libnetworking/arpa/Makefile.am | 2 +- cpukit/libnetworking/configure.ac | 10 +++------- cpukit/libnetworking/kern/Makefile.am | 8 ++++---- cpukit/libnetworking/lib/Makefile.am | 8 ++++---- cpukit/libnetworking/libc/Makefile.am | 8 ++++---- cpukit/libnetworking/machine/Makefile.am | 2 +- cpukit/libnetworking/net/Makefile.am | 8 ++++---- cpukit/libnetworking/netinet/Makefile.am | 8 ++++---- cpukit/libnetworking/nfs/Makefile.am | 8 ++++---- cpukit/libnetworking/rtems/Makefile.am | 6 +++--- cpukit/libnetworking/sys/Makefile.am | 2 +- cpukit/libnetworking/vm/Makefile.am | 2 +- cpukit/libnetworking/wrapup/Makefile.am | 15 +++++---------- 30 files changed, 126 insertions(+), 106 deletions(-) diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog index 4915eb7c2e..65221d5ea7 100644 --- a/c/src/exec/libnetworking/ChangeLog +++ b/c/src/exec/libnetworking/ChangeLog @@ -1,3 +1,21 @@ +2002-05-29 Ralf Corsepius + + Relocate c/src/libnetworking. + * Makefile.am: Reflect moval. + * machine/Makefile.am: Ditto. + * net/Makefile.am: Ditto. + * lib/Makefile.am: Ditto. + * netinet/Makefile.am: Ditto. + * vm/Makefile.am: Ditto. + * libc/Makefile.am: Ditto. + * sys/Makefile.am: Ditto. + * arpa/Makefile.am: Ditto. + * nfs/Makefile.am: Ditto. + * kern/Makefile.am: Ditto. + * rtems/Makefile.am: Ditto. + * configure.ac: Dittp. + * wrapup/Makefile.am: Ditto. Remove references to networking apps. + 2002-05-18 Ralf Corsepius * rtems_telnetd/pty.c: Remove bsp.h. Include . diff --git a/c/src/exec/libnetworking/Makefile.am b/c/src/exec/libnetworking/Makefile.am index 78ca619175..e2123f250f 100644 --- a/c/src/exec/libnetworking/Makefile.am +++ b/c/src/exec/libnetworking/Makefile.am @@ -2,10 +2,11 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../aclocal +ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems \ - rtems_servers pppd rtems_telnetd rtems_webserver wrapup +SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems +# SUBDIRS += rtems_servers pppd rtems_telnetd rtems_webserver +SUBDIRS += wrapup include_HEADERS = \ bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ @@ -23,5 +24,5 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = CHANGELOG -include $(top_srcdir)/../../../automake/subdirs.am -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/subdirs.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/arpa/Makefile.am b/c/src/exec/libnetworking/arpa/Makefile.am index c44c96f6bb..b69a0a390c 100644 --- a/c/src/exec/libnetworking/arpa/Makefile.am +++ b/c/src/exec/libnetworking/arpa/Makefile.am @@ -18,4 +18,4 @@ $(PROJECT_INCLUDE)/arpa/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/configure.ac b/c/src/exec/libnetworking/configure.ac index ab867ab9a9..0131ed5061 100644 --- a/c/src/exec/libnetworking/configure.ac +++ b/c/src/exec/libnetworking/configure.ac @@ -5,8 +5,8 @@ AC_PREREQ(2.52) AC_INIT([rtems-c-src-libnetworking],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([arpa]) -RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) +RTEMS_TOP(../../../..) +AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU @@ -17,7 +17,7 @@ RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_BARE RTEMS_ENABLE_POSIX -RTEMS_ENV_RTEMSBSP +RTEMS_ENV_RTEMSCPU RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST @@ -45,11 +45,7 @@ libc/Makefile net/Makefile netinet/Makefile nfs/Makefile -pppd/Makefile rtems/Makefile -rtems_servers/Makefile -rtems_telnetd/Makefile -rtems_webserver/Makefile wrapup/Makefile ]) AC_OUTPUT diff --git a/c/src/exec/libnetworking/kern/Makefile.am b/c/src/exec/libnetworking/kern/Makefile.am index f189a075dd..4f16fac539 100644 --- a/c/src/exec/libnetworking/kern/Makefile.am +++ b/c/src/exec/libnetworking/kern/Makefile.am @@ -11,9 +11,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -32,4 +32,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = kern_subr.c uipc_domain.c uipc_mbuf.c uipc_socket.c \ uipc_socket2.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/lib/Makefile.am b/c/src/exec/libnetworking/lib/Makefile.am index c84959e261..723960c0dc 100644 --- a/c/src/exec/libnetworking/lib/Makefile.am +++ b/c/src/exec/libnetworking/lib/Makefile.am @@ -11,9 +11,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -30,4 +30,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = README getprotoby.c rtems_bsdnet_ntp.c syslog.c tftpDriver.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/libc/Makefile.am b/c/src/exec/libnetworking/libc/Makefile.am index e652083d31..09e0000e45 100644 --- a/c/src/exec/libnetworking/libc/Makefile.am +++ b/c/src/exec/libnetworking/libc/Makefile.am @@ -19,9 +19,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +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 \ @@ -54,4 +54,4 @@ EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \ 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 +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/machine/Makefile.am b/c/src/exec/libnetworking/machine/Makefile.am index 3031f34e4a..b8490e5a10 100644 --- a/c/src/exec/libnetworking/machine/Makefile.am +++ b/c/src/exec/libnetworking/machine/Makefile.am @@ -19,4 +19,4 @@ $(PROJECT_INCLUDE)/machine/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/net/Makefile.am b/c/src/exec/libnetworking/net/Makefile.am index f17d0a97f5..737ae56260 100644 --- a/c/src/exec/libnetworking/net/Makefile.am +++ b/c/src/exec/libnetworking/net/Makefile.am @@ -14,9 +14,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -48,4 +48,4 @@ $(PROJECT_INCLUDE)/net: $(PROJECT_INCLUDE)/net/%.h: %.h $(INSTALL_DATA) $< $@ -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/netinet/Makefile.am b/c/src/exec/libnetworking/netinet/Makefile.am index 2d2c33036b..89248dce71 100644 --- a/c/src/exec/libnetworking/netinet/Makefile.am +++ b/c/src/exec/libnetworking/netinet/Makefile.am @@ -16,9 +16,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -53,4 +53,4 @@ $(PROJECT_INCLUDE)/netinet: $(PROJECT_INCLUDE)/netinet/%.h: %.h $(INSTALL_DATA) $< $@ -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/nfs/Makefile.am b/c/src/exec/libnetworking/nfs/Makefile.am index 0062e8cebe..53286f6212 100644 --- a/c/src/exec/libnetworking/nfs/Makefile.am +++ b/c/src/exec/libnetworking/nfs/Makefile.am @@ -13,9 +13,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -44,4 +44,4 @@ $(PROJECT_INCLUDE)/nfs: $(PROJECT_INCLUDE)/nfs/%.h: %.h $(INSTALL_DATA) $< $@ -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/rtems/Makefile.am b/c/src/exec/libnetworking/rtems/Makefile.am index 131d5bd14f..bde7327d93 100644 --- a/c/src/exec/libnetworking/rtems/Makefile.am +++ b/c/src/exec/libnetworking/rtems/Makefile.am @@ -28,8 +28,8 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h $(INSTALL_DATA) $< $@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -50,4 +50,4 @@ EXTRA_DIST = issetugid.c rtems_bootp.c rtems_glue.c rtems_select.c \ rtems_showmbuf.c rtems_showroute.c rtems_showtcpstat.c \ rtems_showudpstat.c rtems_syscall.c sghostname.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/sys/Makefile.am b/c/src/exec/libnetworking/sys/Makefile.am index e0cd17e6f4..aa486bd2a3 100644 --- a/c/src/exec/libnetworking/sys/Makefile.am +++ b/c/src/exec/libnetworking/sys/Makefile.am @@ -21,4 +21,4 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/vm/Makefile.am b/c/src/exec/libnetworking/vm/Makefile.am index ac718e1a03..d77c9523ee 100644 --- a/c/src/exec/libnetworking/vm/Makefile.am +++ b/c/src/exec/libnetworking/vm/Makefile.am @@ -20,4 +20,4 @@ $(PROJECT_INCLUDE)/vm/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/libnetworking/wrapup/Makefile.am b/c/src/exec/libnetworking/wrapup/Makefile.am index ff8817f1d7..650d101bbf 100644 --- a/c/src/exec/libnetworking/wrapup/Makefile.am +++ b/c/src/exec/libnetworking/wrapup/Makefile.am @@ -3,18 +3,13 @@ ## -if HAS_POSIX -POSIX_PIECES = rtems_webserver -endif - -NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers \ - rtems_telnetd pppd $(POSIX_PIECES) +NET_O_PIECES = kern lib libc net netinet nfs rtems 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/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -32,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES) .PRECIOUS: $(LIB) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index 4915eb7c2e..65221d5ea7 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,21 @@ +2002-05-29 Ralf Corsepius + + Relocate c/src/libnetworking. + * Makefile.am: Reflect moval. + * machine/Makefile.am: Ditto. + * net/Makefile.am: Ditto. + * lib/Makefile.am: Ditto. + * netinet/Makefile.am: Ditto. + * vm/Makefile.am: Ditto. + * libc/Makefile.am: Ditto. + * sys/Makefile.am: Ditto. + * arpa/Makefile.am: Ditto. + * nfs/Makefile.am: Ditto. + * kern/Makefile.am: Ditto. + * rtems/Makefile.am: Ditto. + * configure.ac: Dittp. + * wrapup/Makefile.am: Ditto. Remove references to networking apps. + 2002-05-18 Ralf Corsepius * rtems_telnetd/pty.c: Remove bsp.h. Include . diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index 78ca619175..e2123f250f 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -2,10 +2,11 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../aclocal +ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems \ - rtems_servers pppd rtems_telnetd rtems_webserver wrapup +SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems +# SUBDIRS += rtems_servers pppd rtems_telnetd rtems_webserver +SUBDIRS += wrapup include_HEADERS = \ bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ @@ -23,5 +24,5 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = CHANGELOG -include $(top_srcdir)/../../../automake/subdirs.am -include $(top_srcdir)/../../../automake/local.am +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 index c44c96f6bb..b69a0a390c 100644 --- a/cpukit/libnetworking/arpa/Makefile.am +++ b/cpukit/libnetworking/arpa/Makefile.am @@ -18,4 +18,4 @@ $(PROJECT_INCLUDE)/arpa/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/configure.ac b/cpukit/libnetworking/configure.ac index ab867ab9a9..0131ed5061 100644 --- a/cpukit/libnetworking/configure.ac +++ b/cpukit/libnetworking/configure.ac @@ -5,8 +5,8 @@ AC_PREREQ(2.52) AC_INIT([rtems-c-src-libnetworking],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([arpa]) -RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) +RTEMS_TOP(../../../..) +AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU @@ -17,7 +17,7 @@ RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_BARE RTEMS_ENABLE_POSIX -RTEMS_ENV_RTEMSBSP +RTEMS_ENV_RTEMSCPU RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST @@ -45,11 +45,7 @@ libc/Makefile net/Makefile netinet/Makefile nfs/Makefile -pppd/Makefile rtems/Makefile -rtems_servers/Makefile -rtems_telnetd/Makefile -rtems_webserver/Makefile wrapup/Makefile ]) AC_OUTPUT diff --git a/cpukit/libnetworking/kern/Makefile.am b/cpukit/libnetworking/kern/Makefile.am index f189a075dd..4f16fac539 100644 --- a/cpukit/libnetworking/kern/Makefile.am +++ b/cpukit/libnetworking/kern/Makefile.am @@ -11,9 +11,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -32,4 +32,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = kern_subr.c uipc_domain.c uipc_mbuf.c uipc_socket.c \ uipc_socket2.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/lib/Makefile.am b/cpukit/libnetworking/lib/Makefile.am index c84959e261..723960c0dc 100644 --- a/cpukit/libnetworking/lib/Makefile.am +++ b/cpukit/libnetworking/lib/Makefile.am @@ -11,9 +11,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -30,4 +30,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = README getprotoby.c rtems_bsdnet_ntp.c syslog.c tftpDriver.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/libc/Makefile.am b/cpukit/libnetworking/libc/Makefile.am index e652083d31..09e0000e45 100644 --- a/cpukit/libnetworking/libc/Makefile.am +++ b/cpukit/libnetworking/libc/Makefile.am @@ -19,9 +19,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +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 \ @@ -54,4 +54,4 @@ EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \ 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 +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/machine/Makefile.am b/cpukit/libnetworking/machine/Makefile.am index 3031f34e4a..b8490e5a10 100644 --- a/cpukit/libnetworking/machine/Makefile.am +++ b/cpukit/libnetworking/machine/Makefile.am @@ -19,4 +19,4 @@ $(PROJECT_INCLUDE)/machine/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am index f17d0a97f5..737ae56260 100644 --- a/cpukit/libnetworking/net/Makefile.am +++ b/cpukit/libnetworking/net/Makefile.am @@ -14,9 +14,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -48,4 +48,4 @@ $(PROJECT_INCLUDE)/net: $(PROJECT_INCLUDE)/net/%.h: %.h $(INSTALL_DATA) $< $@ -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/netinet/Makefile.am b/cpukit/libnetworking/netinet/Makefile.am index 2d2c33036b..89248dce71 100644 --- a/cpukit/libnetworking/netinet/Makefile.am +++ b/cpukit/libnetworking/netinet/Makefile.am @@ -16,9 +16,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -53,4 +53,4 @@ $(PROJECT_INCLUDE)/netinet: $(PROJECT_INCLUDE)/netinet/%.h: %.h $(INSTALL_DATA) $< $@ -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/nfs/Makefile.am b/cpukit/libnetworking/nfs/Makefile.am index 0062e8cebe..53286f6212 100644 --- a/cpukit/libnetworking/nfs/Makefile.am +++ b/cpukit/libnetworking/nfs/Makefile.am @@ -13,9 +13,9 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -44,4 +44,4 @@ $(PROJECT_INCLUDE)/nfs: $(PROJECT_INCLUDE)/nfs/%.h: %.h $(INSTALL_DATA) $< $@ -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/rtems/Makefile.am b/cpukit/libnetworking/rtems/Makefile.am index 131d5bd14f..bde7327d93 100644 --- a/cpukit/libnetworking/rtems/Makefile.am +++ b/cpukit/libnetworking/rtems/Makefile.am @@ -28,8 +28,8 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h $(INSTALL_DATA) $< $@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # Add local stuff here using += @@ -50,4 +50,4 @@ EXTRA_DIST = issetugid.c rtems_bootp.c rtems_glue.c rtems_select.c \ rtems_showmbuf.c rtems_showroute.c rtems_showtcpstat.c \ rtems_showudpstat.c rtems_syscall.c sghostname.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/sys/Makefile.am b/cpukit/libnetworking/sys/Makefile.am index e0cd17e6f4..aa486bd2a3 100644 --- a/cpukit/libnetworking/sys/Makefile.am +++ b/cpukit/libnetworking/sys/Makefile.am @@ -21,4 +21,4 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/vm/Makefile.am b/cpukit/libnetworking/vm/Makefile.am index ac718e1a03..d77c9523ee 100644 --- a/cpukit/libnetworking/vm/Makefile.am +++ b/cpukit/libnetworking/vm/Makefile.am @@ -20,4 +20,4 @@ $(PROJECT_INCLUDE)/vm/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/cpukit/libnetworking/wrapup/Makefile.am b/cpukit/libnetworking/wrapup/Makefile.am index ff8817f1d7..650d101bbf 100644 --- a/cpukit/libnetworking/wrapup/Makefile.am +++ b/cpukit/libnetworking/wrapup/Makefile.am @@ -3,18 +3,13 @@ ## -if HAS_POSIX -POSIX_PIECES = rtems_webserver -endif - -NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers \ - rtems_telnetd pppd $(POSIX_PIECES) +NET_O_PIECES = kern lib libc net netinet nfs rtems 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/compile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -32,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES) .PRECIOUS: $(LIB) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3