Ran ampolish after getting new version from Ralf Corsepius

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

4 files changed, 19 insertions, 70 deletions

diff --git a/make/Makefile.am b/make/Makefile.am
index 6f57121002..a6e35ba4a9 100644
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -4,22 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-rtems_makedir=$(prefix)/make
+rtems_makedir = $(prefix)/make
 
-rtems_make_DATA = \
-main.cfg
+rtems_make_DATA = main.cfg
 
-EXTRA_DIST = \
-README \
-directory.cfg \
-host.cfg.in \
-leaf.cfg \
-lib.cfg
+EXTRA_DIST = README directory.cfg host.cfg.in leaf.cfg lib.cfg
 
-SUBDIRS = \
-Templates \
-custom \
-compilers
+SUBDIRS = Templates custom compilers
 
 ## -------------------------------------------------------
 include $(top_srcdir)/automake/subdirs.am
diff --git a/make/Templates/Makefile.am b/make/Templates/Makefile.am
index 254060d151..52ee7ff73f 100644
--- a/make/Templates/Makefile.am
+++ b/make/Templates/Makefile.am
@@ -4,12 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-rtems_makedir=$(prefix)/make
-rtems_make_Templatesdir=$(rtems_makedir)/Templates
+rtems_makedir = $(prefix)/make
+rtems_make_Templatesdir = $(rtems_makedir)/Templates
 
-rtems_make_Templates_DATA = \
-Makefile.dir \
-Makefile.leaf \
-Makefile.lib
+rtems_make_Templates_DATA = Makefile.dir Makefile.leaf Makefile.lib
 
 include $(top_srcdir)/automake/host.am
diff --git a/make/compilers/Makefile.am b/make/compilers/Makefile.am
index 0c97a6b2ef..d4b915b525 100644
--- a/make/compilers/Makefile.am
+++ b/make/compilers/Makefile.am
@@ -4,10 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-gcc-no_bsp.cfg \
-gcc-portsw.cfg \
-gcc-target-default.cfg
+EXTRA_DIST = gcc-no_bsp.cfg gcc-portsw.cfg gcc-target-default.cfg
 
 ## -------------------------------------------------------
 include $(top_srcdir)/automake/host.am
diff --git a/make/custom/Makefile.am b/make/custom/Makefile.am
index 3987a4c680..ee517664d2 100644
--- a/make/custom/Makefile.am
+++ b/make/custom/Makefile.am
@@ -4,55 +4,19 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-rtems_makedir=$(prefix)/make
-rtems_make_customdir=$(rtems_makedir)/custom
+rtems_makedir = $(prefix)/make
+rtems_make_customdir = $(rtems_makedir)/custom
 
-rtems_make_custom_DATA = \
-default.cfg
+rtems_make_custom_DATA = default.cfg
 
-EXTRA_DIST = \
-FreeBSD-posix.cfg \
-HPUX9-posix.cfg \
-Linux-posix.cfg \
-Solaris-posix.cfg \
-bare.cfg  \
-cvme961.cfg  \
-dmv152.cfg \
-dmv177.cfg \
-efi332.cfg \
-efi68k.cfg \
-erc32.cfg \
-eth_comm.cfg \
-gen68302.cfg \
-gen68340.cfg \
-gen68360.cfg \
-gen68360_040.cfg \
-gensh1.cfg \
-helas403.cfg \
-i386ex.cfg \
-idp.cfg \
-mcp750.cfg \
-mvme136.cfg \
-mvme147.cfg \
-mvme147s.cfg \
-mvme162.cfg \
-mvme162lx.cfg \
-mvme167.cfg \
-mvme2307.cfg \
-no_bsp.cfg \
-ods68302.cfg \
-p4000.cfg \
-p4600.cfg \
-p4650.cfg \
-papyrus.cfg \
-pc386.cfg \
-portsw.cfg \
-posix.cfg \
-ppcn_60x.cfg \
-psim.cfg \
-score603e.cfg \
-simhppa.cfg \
-ts_386ex.cfg
+EXTRA_DIST = FreeBSD-posix.cfg HPUX9-posix.cfg Linux-posix.cfg \
+    Solaris-posix.cfg bare.cfg cvme961.cfg dmv152.cfg dmv177.cfg efi332.cfg \
+    efi68k.cfg erc32.cfg eth_comm.cfg gen68302.cfg gen68340.cfg gen68360.cfg \
+    gen68360_040.cfg gensh1.cfg helas403.cfg i386ex.cfg idp.cfg mcp750.cfg \
+    mvme136.cfg mvme147.cfg mvme147s.cfg mvme162.cfg mvme162lx.cfg \
+    mvme167.cfg mvme2307.cfg no_bsp.cfg ods68302.cfg p4000.cfg p4600.cfg \
+    p4650.cfg papyrus.cfg pc386.cfg portsw.cfg posix.cfg ppcn_60x.cfg \
+    psim.cfg score603e.cfg simhppa.cfg ts_386ex.cfg
 
 ## -------------------------------------------------------
 include $(top_srcdir)/automake/host.am