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.
	irq/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.
	wrapup/Makefile.am: Reflect having moved automake.

20 files changed, 72 insertions, 48 deletions

diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog
index 664f3ea266..16cc57c7ad 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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.
+	irq/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.
+	wrapup/Makefile.am: Reflect having moved automake.
+
 2003-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	PR 452/bsps
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am
index c1d56c8678..eab7f1e521 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am
@@ -12,5 +12,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/arm/arm_bare_bsp/clock/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am
index b8bd1201fa..035ea2752b 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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-local: $(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/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am
index c2444e5773..8e0a82e3d2 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am
@@ -14,8 +14,8 @@ noinst_HEADERS = uart.h
 
 console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
-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) $(console_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am
index efc301602f..b34ebf0958 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am
@@ -22,4 +22,4 @@ all: $(TMPINSTALL_FILES)
 
 EXTRA_DIST = bspio.h bsp.h uart.h registers.h
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am
index 74f8026493..4f92dc486a 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am
@@ -24,8 +24,8 @@ $(PROJECT_INCLUDE)/%.h: %.h
 
 PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
-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 +=
@@ -40,4 +40,4 @@ all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = irq.c bsp_irq_init.c bsp_irq_asm.S
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am
index ab006bacdd..17f821fb26 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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 +=
@@ -29,4 +29,4 @@ all-local: $(ARCH) $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = start.S
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am
index eb419d1720..b817fe0a97 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am
@@ -14,8 +14,8 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 startup_rel_OBJECTS = $(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 +=
@@ -37,4 +37,4 @@ all: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = linkcmds
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am
index 9df5ca46bf..33644f7bde 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am
@@ -12,8 +12,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 +=
@@ -30,4 +30,4 @@ all-local: $(ARCH) $(OBJS) $(PGM)
 
 EXTRA_DIST = timer.c
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am
index ae9949569d..c90f606d4b 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am
@@ -8,8 +8,8 @@ BSP_PIECES = clock console startup timer irq
 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT))
 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 +=
@@ -20,4 +20,4 @@ $(LIB): $(OBJS)
 
 all: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog
index e9901542ab..0cefb80e9f 100644
--- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog
+++ b/c/src/lib/libbsp/arm/vegaplus/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.
+	irq/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.
+	wrapup/Makefile.am: Reflect having moved automake.
+
 2003-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
diff --git a/c/src/lib/libbsp/arm/vegaplus/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/Makefile.am
index 9d04d2524f..2e9513c693 100644
--- a/c/src/lib/libbsp/arm/vegaplus/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/Makefile.am
@@ -12,5 +12,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/arm/vegaplus/clock/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am
index b8bd1201fa..035ea2752b 100644
--- a/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/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-local: $(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/arm/vegaplus/console/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am
index 2c8e49dd22..f9b84cf564 100644
--- a/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am
@@ -12,8 +12,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 +=
@@ -32,4 +32,4 @@ all-local: $(ARCH) $(OBJS) $(PGM)
 
 EXTRA_DIST = console.c
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am
index 71189b267e..7988a10cf0 100644
--- a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am
@@ -22,4 +22,4 @@ TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
 
 all-local: $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
index db6e7b475b..8502c3ec49 100644
--- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am
@@ -17,8 +17,8 @@ include_HEADERS = irq.h
 
 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 +=
@@ -45,4 +45,4 @@ all-local: $(ARCH) $(OBJS) $(PGM)
 
 EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am
index b60224e41d..3f1271ffc5 100644
--- a/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/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: $(ARCH) $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = start.S
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am
index 55498993a4..4e2c0eca78 100644
--- a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/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 +=
@@ -37,4 +37,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = bspstart.c exit.c linkcmds
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am
index 9df5ca46bf..33644f7bde 100644
--- a/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am
@@ -12,8 +12,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 +=
@@ -30,4 +30,4 @@ all-local: $(ARCH) $(OBJS) $(PGM)
 
 EXTRA_DIST = timer.c
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am
index c6482e644b..b082d95ec1 100644
--- a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am
@@ -4,8 +4,8 @@
 
 BSP_FILES = clock console startup irq timer
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
@@ -23,4 +23,4 @@ $(LIB): ${OBJS}
 
 all-local: ${ARCH} $(LIB)
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am