summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-27 01:18:06 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-27 01:18:06 +0000
commit345772eb606005fc2173184cb192ddaacb4e5d0b (patch)
treee33cd5007edece6e8d4408b75dee45f710e3e284
parent2e75ec24f1ce4dbd9a2969e107554506c1f00386 (diff)
downloadrtems-345772eb606005fc2173184cb192ddaacb4e5d0b.tar.bz2
2001-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add automake/force-preinstall.am, aclocal/ppc.am, remove ACLOCAL_M4.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am7
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 14aabaa61a..c49fd19dab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add automake/force-preinstall.am,
+ aclocal/ppc.am, remove ACLOCAL_M4.
+
2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/bsp-alias.m4: Remove score603e_g1.
diff --git a/Makefile.am b/Makefile.am
index 424bec2fba..bc934b55f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS = doc make tools $(BUILD_SUBDIRS) $(TARGET_SUBDIRS)
AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
automake/local.am automake/multilib.am automake/subdirs.am \
- automake/leaf.am
+ automake/leaf.am automake/force-preinstall.am
ACLOCAL_FILES = aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
aclocal/canonical-target-name.m4 aclocal/canonicalize-tools.m4 \
@@ -30,14 +30,13 @@ ACLOCAL_FILES = aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
aclocal/path-perl.m4 aclocal/prog-cc.m4 aclocal/prog-cxx.m4 \
aclocal/project-root.m4 aclocal/rtems-debug.m4 \
aclocal/rtems-test-no-pause.m4 aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 \
- aclocal/target.m4 aclocal/tool-paths.m4
+ aclocal/target.m4 aclocal/tool-paths.m4 aclocal/bspopts.m4 \
+ aclocal/ppc.m4
noinst_SCRIPTS = bootstrap
EXTRA_DIST = $(AUTOMAKE_FILES) $(ACLOCAL_FILES) README.configure SUPPORT \
VERSION LICENSE $(noinst_SCRIPTS)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(ACLOCAL_FILES)
-
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/host.am