summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-08-16 13:02:30 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-08-16 13:02:30 +0000
commit514e77b7ba0c3fb246340a909679c5d99e751fca (patch)
treefe3f301a0f74aa820815168d90ece905cddb516e
parent4c0d512e0318c9d917917695605515234656207c (diff)
downloadrtems-514e77b7ba0c3fb246340a909679c5d99e751fca.tar.bz2
2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Makefile.am: Reflect having moved automake. lib/Makefile.am: Reflect having moved automake. support/Makefile.am: Reflect having moved automake. wrapup/Makefile.am: Reflect having moved automake.
-rw-r--r--c/src/ChangeLog7
-rw-r--r--c/src/Makefile.am4
-rw-r--r--c/src/lib/Makefile.am4
-rw-r--r--c/src/support/Makefile.am6
-rw-r--r--c/src/wrapup/Makefile.am6
5 files changed, 17 insertions, 10 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index e53a50fd9e..e10fe4a677 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,5 +1,12 @@
2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ Makefile.am: Reflect having moved automake.
+ lib/Makefile.am: Reflect having moved automake.
+ support/Makefile.am: Reflect having moved automake.
+ wrapup/Makefile.am: Reflect having moved automake.
+
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* automake/compile.am, automake/force-preinstall.am,
automake/host.am, automake/lib.am, automake/local.am,
automake/subdirs.am: New (copied from ../../automake).
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index db8374adef..16009108c8 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -45,5 +45,5 @@ pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = @host_alias@-@RTEMS_BSP@.pc
DISTCLEANFILES += @host_alias@-@RTEMS_BSP@.pc
-include $(top_srcdir)/../../automake/subdirs.am
-include $(top_srcdir)/../../automake/host.am
+include $(top_srcdir)/automake/subdirs.am
+include $(top_srcdir)/automake/host.am
diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am
index 752a892581..5b5680ccf8 100644
--- a/c/src/lib/Makefile.am
+++ b/c/src/lib/Makefile.am
@@ -4,5 +4,5 @@
SUBDIRS = libcpu libbsp
-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/support/Makefile.am b/c/src/support/Makefile.am
index 9c528fc254..b7fa07117c 100644
--- a/c/src/support/Makefile.am
+++ b/c/src/support/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
AM_CPPFLAGS += -DRTEMS_BSP=\"$(RTEMS_BSP)\"
@@ -17,4 +17,4 @@ $(LIB): $(OBJS)
all-local: $(ARCH) $(LIB)
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 077fb75f81..ae0373d060 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -4,8 +4,8 @@
## build and install "glommed" librtemsbsp.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
LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
@@ -73,4 +73,4 @@ install-data-local:
@$(mkinstalldirs) $(DESTDIR)$(bsplibdir)
$(INSTALL_DATA) $(LIB) $(DESTDIR)$(bsplibdir)
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/local.am