Ran ampolish after getting new version from Ralf Corsepius

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

4 files changed, 34 insertions, 51 deletions

diff --git a/scripts-ada/Makefile.am b/scripts-ada/Makefile.am
index 40b0dd7700..f321615ef6 100644
--- a/scripts-ada/Makefile.am
+++ b/scripts-ada/Makefile.am
@@ -2,31 +2,24 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 SUBDIRS = . binutils gnatnewlib gdb
 
-noinst_SCRIPTS = \
-setup \
-buildall \
-mkbinutilspec \
-mkbspspec \
-mkgnatnewlibspec \
-mkgdbspec \
-mkrpms \
-mkspec
+noinst_SCRIPTS = setup buildall mkbinutilspec mkbspspec mkgnatnewlibspec \
+    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-ada/binutils/Makefile.am b/scripts-ada/binutils/Makefile.am
index fb6187f3bf..a2b96e2996 100644
--- a/scripts-ada/binutils/Makefile.am
+++ b/scripts-ada/binutils/Makefile.am
@@ -2,26 +2,23 @@
 ## $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
 
 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 = \
-sparc-rtems-$(BINUTILSVERS).spec
+RPM_SPECS_DATA = 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-ada/gdb/Makefile.am b/scripts-ada/gdb/Makefile.am
index 28c40a8ed5..13040218c6 100644
--- a/scripts-ada/gdb/Makefile.am
+++ b/scripts-ada/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
 
 powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -15,17 +15,13 @@ powerpc-rtems-$(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 = \
-powerpc-rtems-$(GDBVERS).spec \
-sparc-rtems-$(GDBVERS).spec
+RPM_SPECS_DATA = powerpc-rtems-$(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-ada/gnatnewlib/Makefile.am b/scripts-ada/gnatnewlib/Makefile.am
index 7f5196617a..52232e9c4d 100644
--- a/scripts-ada/gnatnewlib/Makefile.am
+++ b/scripts-ada/gnatnewlib/Makefile.am
@@ -1,11 +1,11 @@
 ## $Id$
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKGNATNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgnatnewlibspec
 
-MKGNATNEWLIBSPEC_DEPS = \
-  $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in $(top_builddir)/setup.cache
+MKGNATNEWLIBSPEC_DEPS = $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in \
+    $(top_builddir)/setup.cache
 
 powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
 	$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -13,17 +13,14 @@ powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
 sparc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
 	$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-gnatnewlib.spec.in
+TEMPLATES = gnatnewlib.spec.in
 
-RPM_SPECS_DATA = \
-powerpc-rtems-$(GNATNEWLIBVERS).spec \
-sparc-rtems-$(GNATNEWLIBVERS).spec 
+RPM_SPECS_DATA = powerpc-rtems-$(GNATNEWLIBVERS).spec \
+    sparc-rtems-$(GNATNEWLIBVERS).spec
 
-noinst_DATA = \
-$(TEMPLATES)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am