2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	Makefile.am: Reflect having moved automake.
	clock/Makefile.am: Reflect having moved automake.
	console/Makefile.am: Reflect having moved automake.
	include/Makefile.am: Reflect having moved automake.
	start/Makefile.am: Reflect having moved automake.
	startup/Makefile.am: Reflect having moved automake.
	timer/Makefile.am: Reflect having moved automake.
	tools/Makefile.am: Reflect having moved automake.
	wrapup/Makefile.am: Reflect having moved automake.

9 files changed, 33 insertions, 21 deletions

diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index 950478c461..479572a7d4 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,15 @@
+2003-08-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	Makefile.am: Reflect having moved automake.
+	clock/Makefile.am: Reflect having moved automake.
+	console/Makefile.am: Reflect having moved automake.
+	include/Makefile.am: Reflect having moved automake.
+	start/Makefile.am: Reflect having moved automake.
+	startup/Makefile.am: Reflect having moved automake.
+	timer/Makefile.am: Reflect having moved automake.
+	tools/Makefile.am: Reflect having moved automake.
+	wrapup/Makefile.am: Reflect having moved automake.
+
 2003-08-14	Joel Sherrill <joel@OARcorp.com>
 
 	* tools/runtest: Add fileio to list of interactive tests.
diff --git a/c/src/lib/libbsp/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am
index b473c0f14d..0101582dbc 100644
--- a/c/src/lib/libbsp/sh/simsh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/Makefile.am
@@ -15,5 +15,5 @@ include $(top_srcdir)/../../bsp.am
 
 EXTRA_DIST = bsp_specs
 
-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/lib/libbsp/sh/simsh4/clock/Makefile.am b/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am
index 8ce1f28813..0e49ad9e7b 100644
--- a/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am
@@ -10,8 +10,8 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -28,4 +28,4 @@ all: $(ARCH) $(OBJS) $(PGM)
 
 EXTRA_DIST = ckinit.c
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/console/Makefile.am b/c/src/lib/libbsp/sh/simsh4/console/Makefile.am
index c1732acd45..29932ada73 100644
--- a/c/src/lib/libbsp/sh/simsh4/console/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/console/Makefile.am
@@ -10,8 +10,8 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.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) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am b/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
index 804410ce0e..5363083e88 100644
--- a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
@@ -12,4 +12,4 @@ PREINSTALL_FILES = $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/start/Makefile.am b/c/src/lib/libbsp/sh/simsh4/start/Makefile.am
index c9a5dd3ddc..d10a230a42 100644
--- a/c/src/lib/libbsp/sh/simsh4/start/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/start/Makefile.am
@@ -7,8 +7,8 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(S_O_FILES)
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.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) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = start.S trap.S
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
index 8648333d74..ddd783667c 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
@@ -13,8 +13,8 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -45,4 +45,4 @@ all-local: $(ARCH) $(TMPINSTALL_FILES) $(OBJS) $(PGM)
 EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds-le \
     linkcmds-le.coff
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am
index 236d82226f..4deaaf991b 100644
--- a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am
@@ -12,8 +12,8 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -30,4 +30,4 @@ all: $(ARCH) $(OBJS) $(PGM)
 
 EXTRA_DIST = timer.c timerisr.S
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am
index f3fec1daa1..153cae1144 100644
--- a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am
@@ -18,8 +18,8 @@ OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
 
 LIB = $(ARCH)/libbsp.a
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -30,4 +30,4 @@ $(LIB): $(OBJS)
 
 all-local: $(ARCH) $(LIB)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am