Split out binutils.

6 files changed, 7 insertions, 160 deletions

diff --git a/contrib/crossrpms/cygwin/i686/Makefile.am b/contrib/crossrpms/cygwin/i686/Makefile.am
index 83f33d2bb8..c7644ef115 100644
--- a/contrib/crossrpms/cygwin/i686/Makefile.am
+++ b/contrib/crossrpms/cygwin/i686/Makefile.am
@@ -53,37 +53,9 @@ CLEANFILES += $(TARGET)-w32api.spec.in
 CLEANFILES += @rpmprefix@$(TARGET)-w32api.spec
 noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec
 
-
-
-
 BINUTILS_VERS = 20050610-1
 BINUTILS_RPMREL = @VERSION@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
+include ../binutils.am
 
 GCC_VERS = 3.4.4-1
 GCC_RPMREL = @VERSION@
diff --git a/contrib/crossrpms/freebsd5.2/i586/Makefile.am b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
index 03807cd22a..bb1b840404 100644
--- a/contrib/crossrpms/freebsd5.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
@@ -31,32 +31,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.16.1
 BINUTILS_RPMREL = @VERSION@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
+include ../binutils.am
 
 GCC_VERS = 4.1.0
 GCC_RPMREL = @VERSION@
diff --git a/contrib/crossrpms/freebsd6.0/i586/Makefile.am b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
index f121c9fc24..4518f3c171 100644
--- a/contrib/crossrpms/freebsd6.0/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
@@ -28,35 +28,9 @@ CLEANFILES += $(TARGET)-libs.spec.in
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
-
 BINUTILS_VERS = 2.16.1
 BINUTILS_RPMREL = @VERSION@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
+include ../binutils.am
 
 GCC_VERS = 4.1.0
 GCC_RPMREL = @VERSION@
diff --git a/contrib/crossrpms/freebsd6.1/i586/Makefile.am b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
index 752e5b1fbc..3f54db3ae4 100644
--- a/contrib/crossrpms/freebsd6.1/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
@@ -31,32 +31,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.16.1
 BINUTILS_RPMREL = @VERSION@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
+include ../binutils.am
 
 GCC_VERS = 4.1.0
 GCC_RPMREL = @VERSION@
diff --git a/contrib/crossrpms/mingw32/i686/Makefile.am b/contrib/crossrpms/mingw32/i686/Makefile.am
index bb89cc0f62..05153ddfad 100644
--- a/contrib/crossrpms/mingw32/i686/Makefile.am
+++ b/contrib/crossrpms/mingw32/i686/Makefile.am
@@ -55,31 +55,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec
 
 BINUTILS_VERS = 2.16.91-20060119-1
 BINUTILS_RPMREL = @VERSION@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
+include ../binutils.am
 
 
 GCC_VERS = 4.1.0
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index fe3962a390..92f8a755e2 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -31,32 +31,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.17
 BINUTILS_RPMREL = @VERSION@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
+include ../binutils.am
 
 GCC_VERS = 4.1.1
 GCC_RPMREL = @VERSION@
@@ -78,7 +53,7 @@ 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
+$(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" \