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

---
 c/src/make/Makefile.am | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'c/src/make/Makefile.am')

diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am
index 01bac334d9..4c09e3160b 100644
--- a/c/src/make/Makefile.am
+++ b/c/src/make/Makefile.am
@@ -5,35 +5,24 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-rtems_makedir=$(prefix)/make
+rtems_makedir = $(prefix)/make
 
-GENERIC_FILES = \
-host.cfg
+GENERIC_FILES = host.cfg
 
-MAKE_FILES = README \
-directory.cfg leaf.cfg \
-lib.cfg
+MAKE_FILES = README directory.cfg lib.cfg
 
-rtems_make_DATA = \
-$(MAKE_FILES) \
-$(GENERIC_FILES)
+rtems_make_DATA = $(MAKE_FILES) $(GENERIC_FILES)
 
-noinst_DATA = \
-main.cfg
+noinst_DATA = main.cfg leaf.cfg
 
 rtemsdir = $(prefix)
 rtems_bspdir = $(rtemsdir)/@RTEMS_BSP@
-rtems_bsp_DATA = \
-Makefile.inc
+rtems_bsp_DATA = Makefile.inc
 
 rtems_bsp_makedir = $(rtems_bspdir)/make
-rtems_bsp_make_DATA = \
-bsp.cfg
+rtems_bsp_make_DATA = bsp.cfg
 
 if MAINTAINER_MODE
-$(srcdir)/main.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/main.cfg
-	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@
-
 $(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in
 	cp $< $@
 
@@ -48,5 +37,9 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 	@echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@
 	@echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@
 
+DISTCLEANFILES = @RTEMS_BSP@.cache
+
+EXTRA_DIST = leaf.cfg
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
-- 
cgit v1.2.3