From 087a6c86f55b8ddbd6a5bc1961e28a044225475f Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 2 Sep 2003 16:41:50 +0000
Subject: 2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am, configure.ac,
	autotools/autoconf-rtems.spec.in, autotools/automake-rtems.spec.in,
	binutils/Makefile.am, binutils/base-binutils.add,
	binutils/binutils.add, binutils/mkspec.in,
	binutils/target-binutils.add,
	common/common.add.in,
	cpukit/Makefile.am,
	gcc3newlib/Makefile.am, gcc3newlib/base-g77.add,
	gcc3newlib/base-gcc.add, gcc3newlib/base-gcj.add,
	gcc3newlib/base-gnat.add, gcc3newlib/gccnewlib.add,
	gcc3newlib/mkspec.in, gcc3newlib/target-c++.add,
	gcc3newlib/target-g77.add, gcc3newlib/target-gcc.add,
	gcc3newlib/target-gcj.add, gcc3newlib/target-gnat.add,
	gcc3newlib/target-objc.add,
	gccnewlib/Makefile.am,
	gdb/Makefile.am,
	rtems/Makefile.am,
	rtemsdoc/Makefile.am:
	Merger from rtems-4-6-branch.
	* common/common.am: New.
---
 scripts/binutils/Makefile.am | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

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

diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index aad90027a9..9953111019 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -2,6 +2,7 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
 
 MKBINUTILSSPEC = $(SHELL) ./mkspec
 
@@ -13,61 +14,67 @@ SUBPACKAGES += base-binutils.add target-binutils.add
 binutils.spec.in: $(SUBPACKAGES)
 	cat $^ > $@
 CLEANFILES = binutils.spec.in
+RPM_SPECS_DATA =
 
 MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \
     $(top_builddir)/setup.cache
 
 arm-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
+RPM_SPECS_DATA += arm-rtems-$(BINUTILSVERS).spec
 
 c4x-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
+RPM_SPECS_DATA += c4x-rtems-$(BINUTILSVERS).spec
 
 h8300-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@
+RPM_SPECS_DATA += h8300-rtems-$(BINUTILSVERS).spec
 
 hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@
+RPM_SPECS_DATA += hppa1.1-rtems-$(BINUTILSVERS).spec
 
 i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@
+RPM_SPECS_DATA += i386-rtems-$(BINUTILSVERS).spec
 
 i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@
+RPM_SPECS_DATA += i960-rtems-$(BINUTILSVERS).spec
 
 m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@
+RPM_SPECS_DATA += m68k-rtems-$(BINUTILSVERS).spec
 
 mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@
+RPM_SPECS_DATA += mips64orion-rtems-$(BINUTILSVERS).spec
+
 mips-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@
+RPM_SPECS_DATA += mips-rtems-$(BINUTILSVERS).spec
 
 or32-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache or32-rtems > $@
+RPM_SPECS_DATA += or32-rtems-$(BINUTILSVERS).spec
 
 powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@
+RPM_SPECS_DATA += powerpc-rtems-$(BINUTILSVERS).spec
 
 sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@
+RPM_SPECS_DATA += sh-rtems-$(BINUTILSVERS).spec
 
 sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@
+RPM_SPECS_DATA += sh-rtemself-$(BINUTILSVERS).spec
 
 sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@
+RPM_SPECS_DATA += sparc-rtems-$(BINUTILSVERS).spec
 
-RPM_SPECS_DATA = \
-    arm-rtems-$(BINUTILSVERS).spec \
-    c4x-rtems-$(BINUTILSVERS).spec h8300-rtems-$(BINUTILSVERS).spec \
-    hppa1.1-rtems-$(BINUTILSVERS).spec \
-    i386-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec \
-    m68k-rtems-$(BINUTILSVERS).spec \
-    mips-rtems-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec \
-    or32-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 = $(SUBPACKAGES)
-- 
cgit v1.2.3