2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* arpa/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* kern/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* Makefile.am: Include $(top_srcdir)/../automake/*.am.
	Use ../aclocal.
	* lib/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* libc/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* machine/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* net/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* netinet/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* nfs/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* rtems/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* sys/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* vm/Makefile.am: Include $(top_srcdir)/../automake/*.am.
	* wrapup/Makefile.am: Include $(top_srcdir)/../automake/*.am.

14 files changed, 56 insertions, 39 deletions

diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog
index 733c079140..0523622ec2 100644
--- a/c/src/exec/libnetworking/ChangeLog
+++ b/c/src/exec/libnetworking/ChangeLog
@@ -1,3 +1,20 @@
+2002-06-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* arpa/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* kern/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	Use ../aclocal.
+	* lib/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* libc/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* machine/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* net/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* netinet/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* nfs/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* rtems/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* sys/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* vm/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+	* wrapup/Makefile.am: Include $(top_srcdir)/../automake/*.am.
+
 2002-06-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* rtems/Makefile.am: include multilib.am instead of RTEMS_BSP.cfg.
diff --git a/c/src/exec/libnetworking/Makefile.am b/c/src/exec/libnetworking/Makefile.am
index e2123f250f..a59848d0c2 100644
--- a/c/src/exec/libnetworking/Makefile.am
+++ b/c/src/exec/libnetworking/Makefile.am
@@ -2,7 +2,7 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../../aclocal
+ACLOCAL_AMFLAGS = -I ../aclocal
 
 SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems
 # SUBDIRS += rtems_servers pppd rtems_telnetd rtems_webserver 
@@ -24,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 b69a0a390c..7035012a57 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/kern/Makefile.am b/c/src/exec/libnetworking/kern/Makefile.am
index 4f16fac539..7fb7e608ad 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 $(top_srcdir)/../../../../automake/multilib.am
-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 723960c0dc..e0a2a6de7d 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 $(top_srcdir)/../../../../automake/multilib.am
-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 09e0000e45..e007445c13 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 $(top_srcdir)/../../../../automake/multilib.am
-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 b8490e5a10..b3c8f64282 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 737ae56260..7490585015 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 $(top_srcdir)/../../../../automake/multilib.am
-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 89248dce71..fcc93a41c4 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 $(top_srcdir)/../../../../automake/multilib.am
-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 53286f6212..8d213b78fc 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 $(top_srcdir)/../../../../automake/multilib.am
-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 a520aecb1b..f0d70abd6b 100644
--- a/c/src/exec/libnetworking/rtems/Makefile.am
+++ b/c/src/exec/libnetworking/rtems/Makefile.am
@@ -27,9 +27,9 @@ $(PROJECT_INCLUDE)/rtems:
 $(PROJECT_INCLUDE)/rtems/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-include $(RTEMS_ROOT)/../../../../automake/multilib.am
-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 +=
@@ -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 aa486bd2a3..058b9e166e 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 d77c9523ee..beddcba490 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 650d101bbf..f712d70dd0 100644
--- a/c/src/exec/libnetworking/wrapup/Makefile.am
+++ b/c/src/exec/libnetworking/wrapup/Makefile.am
@@ -7,9 +7,9 @@ NET_O_PIECES = kern lib libc net netinet nfs rtems
 OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
 LIB = $(ARCH)/libnetworking.a
 
-include $(top_srcdir)/../../../../automake/multilib.am
-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 +=
@@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(LIB)
 
-include $(top_srcdir)/../../../../automake/local.am
+include $(top_srcdir)/../automake/local.am