Ran ampolish after getting new version from Ralf Corsepius

<corsepiu@faw.uni-ulm.de>.

5 files changed, 63 insertions, 99 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2daa93a409..bea8976a1b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,31 +2,24 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 SUBDIRS = . binutils gccnewlib gdb rtems
 
-noinst_SCRIPTS = \
-setup \
-buildall \
-mkbinutilspec \
-mkbspspec \
-mkgccnewlibspec \
-mkgdbspec \
-mkrpms \
-mkspec
+noinst_SCRIPTS = setup buildall mkbinutilspec mkbspspec mkgccnewlibspec \
+    mkgdbspec mkrpms mkspec
 
-TEMPLATES = 
+TEMPLATES =
 
-noinst_DATA = \
-setup.def $(TEMPLATES)
+noinst_DATA = setup.def $(TEMPLATES)
 
-EXTRA_DIST = \
-$(noinst_DATA) \
-$(noinst_SCRIPTS)
+EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS)
 
 CONFIGURE_DEPENDENCIES = setup.cache
 setup.cache: setup.def
 	cp setup.def $@
 
 DISTCLEANFILES = setup.cache
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index 0e40d96a8e..062e79ffee 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -2,12 +2,12 @@
 ## $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
+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 +39,18 @@ 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
+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
+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)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 659f284c81..2f3b030b65 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -2,17 +2,16 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
 
 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 +43,18 @@ 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
+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 
+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)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index 16bd1e449c..78ad98922f 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -2,12 +2,12 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
 
-MKGDBSPEC_DEPS = \
-$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
+MKGDBSPEC_DEPS = $(top_builddir)/mkgdbspec gdb.spec.in \
+    $(top_builddir)/setup.cache
 
 hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
@@ -39,25 +39,17 @@ sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-gdb.spec.in
+TEMPLATES = gdb.spec.in
 
-RPM_SPECS_DATA = \
-hppa1.1-rtems-$(GDBVERS).spec \
-i386-rtems-$(GDBVERS).spec \
-i960-rtems-$(GDBVERS).spec \
-m68k-rtems-$(GDBVERS).spec \
-m68k-rtemself-$(GDBVERS).spec \
-mips64orion-rtems-$(GDBVERS).spec \
-powerpc-rtems-$(GDBVERS).spec \
-sh-rtems-$(GDBVERS).spec \
-sh-rtemself-$(GDBVERS).spec \
-sparc-rtems-$(GDBVERS).spec
+RPM_SPECS_DATA = hppa1.1-rtems-$(GDBVERS).spec i386-rtems-$(GDBVERS).spec \
+    i960-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec \
+    m68k-rtemself-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec \
+    powerpc-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec \
+    sh-rtemself-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec
 
-noinst_DATA = \
-$(TEMPLATES)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index d6cce0214d..e8a8026821 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -2,11 +2,12 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec
 
-MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in $(top_builddir)/setup.cache
+MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in \
+    $(top_builddir)/setup.cache
 
 hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa
@@ -38,25 +39,19 @@ sh-rtemself-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems erc32
 
-TEMPLATES = \
-rtems.spec.in
+TEMPLATES = rtems.spec.in
 
-RPM_SPECS_DATA = \
-hppa1.1-rtems-simhppa-$(BSPVERS).spec \
-i386-rtems-pc386-$(BSPVERS).spec \
-i960-rtems-cvme961-$(BSPVERS).spec \
-m68k-rtems-gen68360-$(BSPVERS).spec \
-m68k-rtemself-gen68360-$(BSPVERS).spec \
-mips64orion-rtems-p4600-$(BSPVERS).spec \
-powerpc-rtems-mcp750-$(BSPVERS).spec \
-sh-rtems-gensh1-$(BSPVERS).spec \
-sh-rtemself-gensh1-$(BSPVERS).spec \
-sparc-rtems-erc32-$(BSPVERS).spec
+RPM_SPECS_DATA = hppa1.1-rtems-simhppa-$(BSPVERS).spec \
+    i386-rtems-pc386-$(BSPVERS).spec i960-rtems-cvme961-$(BSPVERS).spec \
+    m68k-rtems-gen68360-$(BSPVERS).spec \
+    m68k-rtemself-gen68360-$(BSPVERS).spec \
+    mips64orion-rtems-p4600-$(BSPVERS).spec \
+    powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \
+    sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec
 
-noinst_DATA = \
-$(TEMPLATES)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am