summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/arm/ChangeLog4
-rw-r--r--c/src/lib/libbsp/arm/Makefile.am4
-rw-r--r--c/src/lib/libbsp/c4x/ChangeLog4
-rw-r--r--c/src/lib/libbsp/c4x/Makefile.am4
-rw-r--r--c/src/lib/libbsp/c4x/shared/ChangeLog4
-rw-r--r--c/src/lib/libbsp/c4x/shared/Makefile.am2
-rw-r--r--c/src/lib/libcpu/ChangeLog4
-rw-r--r--c/src/lib/libcpu/Makefile.am4
-rw-r--r--c/src/lib/libcpu/i386/ChangeLog4
-rw-r--r--c/src/lib/libcpu/i386/Makefile.am6
-rw-r--r--c/src/lib/libcpu/sh/ChangeLog4
-rw-r--r--c/src/lib/libcpu/sh/Makefile.am4
-rw-r--r--c/src/lib/libcpu/sh/sh7032/ChangeLog4
-rw-r--r--c/src/lib/libcpu/sh/sh7032/Makefile.am6
-rw-r--r--c/src/lib/libcpu/sh/sh7045/ChangeLog4
-rw-r--r--c/src/lib/libcpu/sh/sh7045/Makefile.am6
-rw-r--r--c/src/lib/libcpu/sh/sh7750/ChangeLog4
-rw-r--r--c/src/lib/libcpu/sh/sh7750/Makefile.am6
-rw-r--r--c/src/make/ChangeLog4
-rw-r--r--c/src/make/Makefile.am2
-rw-r--r--c/src/optman/ChangeLog4
-rw-r--r--c/src/optman/Makefile.am6
22 files changed, 69 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/arm/ChangeLog b/c/src/lib/libbsp/arm/ChangeLog
index 8ec3d601c0..fde43b8596 100644
--- a/c/src/lib/libbsp/arm/ChangeLog
+++ b/c/src/lib/libbsp/arm/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index 1bd2feae20..a26c076dcc 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -9,5 +9,5 @@ ACLOCAL_AMFLAGS = -I ../../../../../aclocal
## added but it is present in the source tree.
SUBDIRS = shared $(RTEMS_BSP_FAMILY)
-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/c4x/ChangeLog b/c/src/lib/libbsp/c4x/ChangeLog
index 6830626eb1..c5ff1614fe 100644
--- a/c/src/lib/libbsp/c4x/ChangeLog
+++ b/c/src/lib/libbsp/c4x/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/c4x/Makefile.am b/c/src/lib/libbsp/c4x/Makefile.am
index 7c96d4c004..577f67f24d 100644
--- a/c/src/lib/libbsp/c4x/Makefile.am
+++ b/c/src/lib/libbsp/c4x/Makefile.am
@@ -7,5 +7,5 @@ ACLOCAL_AMFLAGS = -I ../../../../../aclocal
## Descend into the $(RTEMS_BSP_FAMILY) directory
SUBDIRS = shared $(RTEMS_BSP_FAMILY)
-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/c4x/shared/ChangeLog b/c/src/lib/libbsp/c4x/shared/ChangeLog
index 9f81f511ca..bd104dbe7d 100644
--- a/c/src/lib/libbsp/c4x/shared/ChangeLog
+++ b/c/src/lib/libbsp/c4x/shared/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove AUTOMAKE_OPTIONS.
diff --git a/c/src/lib/libbsp/c4x/shared/Makefile.am b/c/src/lib/libbsp/c4x/shared/Makefile.am
index f625c74901..830f9da1e6 100644
--- a/c/src/lib/libbsp/c4x/shared/Makefile.am
+++ b/c/src/lib/libbsp/c4x/shared/Makefile.am
@@ -7,4 +7,4 @@ C_FILES = bspspuriousinit.c c3xspurious.c c4xspurious.c
EXTRA_DIST = bspspuriousinit.c c3xspurious.c c4xspurious.c
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/ChangeLog b/c/src/lib/libcpu/ChangeLog
index 669eecb766..15d12461e4 100644
--- a/c/src/lib/libcpu/ChangeLog
+++ b/c/src/lib/libcpu/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+
2003-08-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../../configure.ac).
diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am
index 35eeb1d2a6..e50ba5ecf1 100644
--- a/c/src/lib/libcpu/Makefile.am
+++ b/c/src/lib/libcpu/Makefile.am
@@ -10,5 +10,5 @@ shared/src/cache_manager.c
SUBDIRS = @libcpu_cpu_subdir@
DIST_SUBDIRS = @libcpu_cpu_subdir@
-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/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog
index a96637a8ab..557bd505d0 100644
--- a/c/src/lib/libcpu/i386/ChangeLog
+++ b/c/src/lib/libcpu/i386/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index bf8fb204ea..383f58d86e 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -17,8 +17,8 @@ include_libcpu_HEADERS = cpu.h cpuModel.h cache.h
S_FILES = cpuModel.S idtr.S
OBJS += $(S_FILES:%.S=$(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
AM_CPPFLAGS += -I$(srcdir)
@@ -41,4 +41,4 @@ CLEANFILES = cache.h
EXTRA_DIST = cache.c cache_.h cpu.h cpuModel.S cpuModel.h displayCpu.c idt.c \
idtr.S page.c registers.h
-include $(top_srcdir)/../../../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog
index a2efd27f8c..fde10e6f84 100644
--- a/c/src/lib/libcpu/sh/ChangeLog
+++ b/c/src/lib/libcpu/sh/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am
index e81ecdb623..359c2f600e 100644
--- a/c/src/lib/libcpu/sh/Makefile.am
+++ b/c/src/lib/libcpu/sh/Makefile.am
@@ -6,5 +6,5 @@ ACLOCAL_AMFLAGS = -I ../../../../../aclocal
SUBDIRS = @subdirs@
-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/libcpu/sh/sh7032/ChangeLog b/c/src/lib/libcpu/sh/sh7032/ChangeLog
index e9c6453d2e..805d7abf2b 100644
--- a/c/src/lib/libcpu/sh/sh7032/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7032/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am
index 047ba404cc..2c17326b1b 100644
--- a/c/src/lib/libcpu/sh/sh7032/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am
@@ -4,8 +4,8 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
@@ -101,4 +101,4 @@ all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS)
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7045/ChangeLog b/c/src/lib/libcpu/sh/sh7045/ChangeLog
index adbef3d22b..2e4f1f7e60 100644
--- a/c/src/lib/libcpu/sh/sh7045/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7045/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am
index 20ff52133b..95622f19e4 100644
--- a/c/src/lib/libcpu/sh/sh7045/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am
@@ -4,8 +4,8 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
@@ -89,4 +89,4 @@ all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS)
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog
index a796351791..a1b3d51f77 100644
--- a/c/src/lib/libcpu/sh/sh7750/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am
index 7a83eb16cd..6c35d929cc 100644
--- a/c/src/lib/libcpu/sh/sh7750/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am
@@ -4,8 +4,8 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
@@ -95,4 +95,4 @@ all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS)
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog
index cbb06332b7..1ee0ed5b10 100644
--- a/c/src/make/ChangeLog
+++ b/c/src/make/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ 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/make/Makefile.am b/c/src/make/Makefile.am
index 71f5f2f866..236225bea9 100644
--- a/c/src/make/Makefile.am
+++ b/c/src/make/Makefile.am
@@ -32,4 +32,4 @@ endif
rtems_make_compilersdir = $(rtems_makedir)/compilers
dist_rtems_make_compilers_DATA = compilers/gcc-target-default.cfg
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog
index b42f7dee5b..75a2fd9bd0 100644
--- a/c/src/optman/ChangeLog
+++ b/c/src/optman/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+
2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../configure.ac).
diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am
index e0f99135d6..6048c3f3cc 100644
--- a/c/src/optman/Makefile.am
+++ b/c/src/optman/Makefile.am
@@ -2,8 +2,8 @@
## $Id$
##
-include $(top_srcdir)/../../automake/compile.am
-include $(top_srcdir)/../../automake/lib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
sapi_C_FILES = sapi/no-ext.c sapi/no-io.c
OBJS = $(sapi_C_FILES:sapi/%.c=$(ARCH)/%.$(OBJEXT))
@@ -45,4 +45,4 @@ install-data-local: $(PGMS)
EXTRA_DIST = $(rtems_C_FILES) $(sapi_C_FILES)
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/local.am