1 files changed, 33 insertions, 29 deletions
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 659f284c81..267c0b68a3 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -2,17 +2,33 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
 
+SUBPACKAGES = gccnewlib.add \
+    base-gcc.add target-gcc.add \
+    base-chill.add target-chill.add \
+    base-g77.add target-g77.add \
+    base-gcj.add target-gcj.add \
+    target-objc.add
+
+gccnewlib.spec.in: $(SUBPACKAGES)
+	cat $^ \
+	| sed -e 's%@GCCLANGS@%%g' > $@
+CLEANFILES += gccnewlib.spec.in
+
+gccnewlib_c_only.spec.in: gccnewlib.add base-gcc.add target-gcc.add
+	cat $^ \
+	| sed -e "s%@GCCLANGS@%\'--enable-languages=c,c++\'%g" > $@
+CLEANFILES += gccnewlib_c_only.spec.in
+
 C_ONLY_ARG = -a $(top_builddir)/gccnewlib/gccnewlib_c_only.spec.in
 
-MKGCCNEWLIBSPEC_DEPS = \
-  $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
-MKGCCNEWLIB_C_ONLY_SPEC_DEPS = \
-  $(top_builddir)/mkgccnewlibspec gccnewlib_c_only.spec.in \
-  $(top_builddir)/setup.cache
+MKGCCNEWLIBSPEC_DEPS = $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in \
+    $(top_builddir)/setup.cache
+MKGCCNEWLIB_C_ONLY_SPEC_DEPS = $(top_builddir)/mkgccnewlibspec \
+    gccnewlib_c_only.spec.in $(top_builddir)/setup.cache
 
 hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
@@ -44,26 +60,14 @@ sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-gccnewlib.spec.in \
-gccnewlib_c_only.spec.in
-
-RPM_SPECS_DATA = \
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec \
-i386-rtems-$(GCCNEWLIBVERS).spec \
-i960-rtems-$(GCCNEWLIBVERS).spec \
-m68k-rtems-$(GCCNEWLIBVERS).spec \
-m68k-rtemself-$(GCCNEWLIBVERS).spec \
-mips64orion-rtems-$(GCCNEWLIBVERS).spec \
-powerpc-rtems-$(GCCNEWLIBVERS).spec \
-sh-rtems-$(GCCNEWLIBVERS).spec \
-sh-rtemself-$(GCCNEWLIBVERS).spec \
-sparc-rtems-$(GCCNEWLIBVERS).spec 
-
-noinst_DATA = \
-$(TEMPLATES)
-
-EXTRA_DIST = \
-$(TEMPLATES)
-
-CLEANFILES = $(RPM_SPECS_DATA)
+RPM_SPECS_DATA = hppa1.1-rtems-$(GCCNEWLIBVERS).spec \
+    i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \
+    m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec \
+    mips64orion-rtems-$(GCCNEWLIBVERS).spec \
+    powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \
+    sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec
+CLEANFILES += $(RPM_SPECS_DATA)
+
+EXTRA_DIST = $(SUBPACKAGES)
+
+include $(top_srcdir)/../automake/local.am