summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-27 19:26:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-27 19:26:39 +0000
commit8738dfaa7b6183b126056cd008172348138995a2 (patch)
treeb439248367ac84c29f0caec7516971ba34b44ff0
parent46d31795ed06d0302627e1976b9fbe37dc55f982 (diff)
downloadrtems-8738dfaa7b6183b126056cd008172348138995a2.tar.bz2
2001-09-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/lib.am: Comment out LD. * Makefile.am: Use ACLOCAL_FILES = to make automake-1.5 happy; Add automake/leaf.am to AUTOMAKE_FILES.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am5
-rw-r--r--automake/lib.am2
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 58af0e772a..411aabfdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * automake/lib.am: Comment out LD.
+ * Makefile.am: Use ACLOCAL_FILES = to make automake-1.5 happy; Add
+ automake/leaf.am to AUTOMAKE_FILES.
+
2001-09-27 Joel Sherrill <joel@OARcorp.com>
* config.guess: No longer in CVS since installed by bootstrap.
diff --git a/Makefile.am b/Makefile.am
index 8cd4def662..b780da4d46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,10 @@ ACLOCAL_AMFLAGS = -I aclocal
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/local.am automake/multilib.am automake/subdirs.am \
+ automake/leaf.am
-ACLOCAL_FILES += aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
+ACLOCAL_FILES = aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
aclocal/canonical-target-name.m4 aclocal/canonicalize-tools.m4 \
aclocal/check-bsp-cache.m4 aclocal/check-bsps.m4 aclocal/check-cpu.m4 \
aclocal/check-cxx.m4 aclocal/check-itron.m4 \
diff --git a/automake/lib.am b/automake/lib.am
index e072b26265..a1e93dc193 100644
--- a/automake/lib.am
+++ b/automake/lib.am
@@ -2,7 +2,7 @@
## $Id$
##
-LD = @LD@
+## LD = @LD@
AR = @AR@
RANLIB = @RANLIB@