From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 Makefile.am | 85 ++++++++++++++++++-------------------------------------------
 1 file changed, 25 insertions(+), 60 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index f4eca8b799..83561efa43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,67 +11,32 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 SUBDIRS = doc make tools @TARGET_SUBDIRS@
 
-AUTOMAKE_FILES = \
-automake/subdirs.am \
-automake/local.am \
-automake/lib.am
-
-ACLOCAL_FILES += \
-aclocal/ar-s.m4 \
-aclocal/bsp-alias.m4 \
-aclocal/canonical-host.m4 \
-aclocal/canonical-target-name.m4 \
-aclocal/canonicalize-tools.m4 \
-aclocal/check-bsps.m4 \
-aclocal/check-bsp-cache.m4 \
-aclocal/check-cpu.m4 \
-aclocal/check-cxx.m4 \
-aclocal/check-itron.m4 \
-aclocal/check-multiprocessing.m4 \
-aclocal/check-networking.m4 \
-aclocal/check-newlib.m4 \
-aclocal/check-posix.m4 \
-aclocal/check-rdbg.m4 \
-aclocal/enable-bare.m4 \
-aclocal/enable-cxx.m4 \
-aclocal/enable-gcc28.m4 \
-aclocal/enable-hwapi.m4 \
-aclocal/enable-inlines.m4 \
-aclocal/enable-itron.m4 \
-aclocal/enable-libcdir.m4 \
-aclocal/enable-multiprocessing.m4 \
-aclocal/enable-networking.m4 \
-aclocal/enable-posix.m4 \
-aclocal/enable-rdbg.m4 \
-aclocal/enable-rtemsbsp.m4 \
-aclocal/enable-tests.m4 \
-aclocal/gcc-pipe.m4 \
-aclocal/gcc-specs.m4 \
-aclocal/i386-gas-code16.m4 \
-aclocal/path-ksh.m4 \
-aclocal/path-perl.m4 \
-aclocal/prog-cc.m4 \
-aclocal/prog-cxx.m4 \
-aclocal/project-root.m4 \
-aclocal/rtems-top.m4 \
-aclocal/sysv-ipc.m4 \
-aclocal/target.m4 \
-aclocal/tool-paths.m4 \
-aclocal/tool-prefix.m4
-
-noinst_SCRIPTS = \
-bootstrap
-
-EXTRA_DIST = \
-$(AUTOMAKE_FILES) \
-$(ACLOCAL_FILES) \
-README.configure \
-SUPPORT \
-VERSION \
-LICENSE \
-$(noinst_SCRIPTS)
+AUTOMAKE_FILES = automake/subdirs.am automake/local.am automake/lib.am
+
+ACLOCAL_FILES += aclocal/ar-s.m4 aclocal/bsp-alias.m4 \
+    aclocal/canonical-host.m4 aclocal/canonical-target-name.m4 \
+    aclocal/canonicalize-tools.m4 aclocal/check-bsps.m4 \
+    aclocal/check-bsp-cache.m4 aclocal/check-cpu.m4 aclocal/check-cxx.m4 \
+    aclocal/check-itron.m4 aclocal/check-multiprocessing.m4 \
+    aclocal/check-networking.m4 aclocal/check-newlib.m4 \
+    aclocal/check-posix.m4 aclocal/check-rdbg.m4 aclocal/enable-bare.m4 \
+    aclocal/enable-cxx.m4 aclocal/enable-gcc28.m4 aclocal/enable-hwapi.m4 \
+    aclocal/enable-inlines.m4 aclocal/enable-itron.m4 \
+    aclocal/enable-libcdir.m4 aclocal/enable-multiprocessing.m4 \
+    aclocal/enable-networking.m4 aclocal/enable-posix.m4 \
+    aclocal/enable-rdbg.m4 aclocal/enable-rtemsbsp.m4 \
+    aclocal/enable-tests.m4 aclocal/gcc-pipe.m4 aclocal/gcc-specs.m4 \
+    aclocal/i386-gas-code16.m4 aclocal/path-ksh.m4 aclocal/path-perl.m4 \
+    aclocal/prog-cc.m4 aclocal/prog-cxx.m4 aclocal/project-root.m4 \
+    aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 aclocal/target.m4 \
+    aclocal/tool-paths.m4 aclocal/tool-prefix.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/local.am
+include $(top_srcdir)/automake/host.am
-- 
cgit v1.2.3