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

---
 scripts/binutils/Makefile.am | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'scripts/binutils/Makefile.am')

diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index 0e40d96a8e..b270a3e205 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -2,12 +2,19 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
 
-MKBINUTILSSPEC_DEPS = \
-$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
+SUBPACKAGES = binutils.add \
+  base-binutils.add target-binutils.add
+
+binutils.spec.in: $(SUBPACKAGES)
+	cat $^ > $@
+CLEANFILES += binutils.spec.in
+
+MKBINUTILSSPEC_DEPS = $(top_builddir)/mkbinutilspec binutils.spec.in \
+    $(top_builddir)/setup.cache
 
 hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
@@ -39,25 +46,14 @@ sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-binutils.spec.in
-
-RPM_SPECS_DATA = \
-hppa1.1-rtems-$(BINUTILSVERS).spec \
-i386-rtems-$(BINUTILSVERS).spec \
-i960-rtems-$(BINUTILSVERS).spec \
-m68k-rtems-$(BINUTILSVERS).spec \
-m68k-rtemself-$(BINUTILSVERS).spec \
-mips64orion-rtems-$(BINUTILSVERS).spec \
-powerpc-rtems-$(BINUTILSVERS).spec \
-sh-rtems-$(BINUTILSVERS).spec \
-sh-rtemself-$(BINUTILSVERS).spec \
-sparc-rtems-$(BINUTILSVERS).spec
-
-noinst_DATA = \
-$(TEMPLATES)
+RPM_SPECS_DATA = hppa1.1-rtems-$(BINUTILSVERS).spec \
+    i386-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec \
+    m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec \
+    mips64orion-rtems-$(BINUTILSVERS).spec \
+    powerpc-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec \
+    sh-rtemself-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec
+CLEANFILES += $(RPM_SPECS_DATA)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(SUBPACKAGES)
 
-CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am
-- 
cgit v1.2.3