Split out GCC.

3 files changed, 6 insertions, 109 deletions

diff --git a/contrib/crossrpms/freebsd5.2/i586/Makefile.am b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
index bb1b840404..cd86f2b72c 100644
--- a/contrib/crossrpms/freebsd5.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
@@ -28,46 +28,11 @@ CLEANFILES += $(TARGET)-libs.spec.in
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
-
 BINUTILS_VERS = 2.16.1
 BINUTILS_RPMREL = @VERSION@
 include ../binutils.am
 
 GCC_VERS = 4.1.0
 GCC_RPMREL = @VERSION@
-GCC_OPTS = --languages=c,cxx,f95
-EXTRA_DIST += ../gcc-prep.add
-EXTRA_DIST += gcc-sources.add
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
-	cat $(GCC_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
-@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
+include ../gcc.am
+GCC_OPTS += --languages=c,cxx,f95
diff --git a/contrib/crossrpms/freebsd6.0/i586/Makefile.am b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
index 4518f3c171..f1cba8ea17 100644
--- a/contrib/crossrpms/freebsd6.0/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
@@ -34,39 +34,5 @@ include ../binutils.am
 
 GCC_VERS = 4.1.0
 GCC_RPMREL = @VERSION@
-GCC_OPTS = --languages=c,cxx,f95
-EXTRA_DIST += ../gcc-prep.add
-EXTRA_DIST += gcc-sources.add
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
-	cat $(GCC_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
-@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
+include ../gcc.am
+GCC_OPTS += --languages=c,cxx,f95
diff --git a/contrib/crossrpms/freebsd6.1/i586/Makefile.am b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
index 3f54db3ae4..a9375fcdfd 100644
--- a/contrib/crossrpms/freebsd6.1/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
@@ -35,39 +35,5 @@ include ../binutils.am
 
 GCC_VERS = 4.1.0
 GCC_RPMREL = @VERSION@
-GCC_OPTS = --languages=c,cxx,f95
-EXTRA_DIST += ../gcc-prep.add
-EXTRA_DIST += gcc-sources.add
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
-	cat $(GCC_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
-@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
+include ../gcc.am
+GCC_OPTS += --languages=c,cxx,f95