8 files changed, 34 insertions, 33 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 3ff2c3b8dd..8b21aba9a4 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -41,7 +41,8 @@ EXTRA_PROGRAMS += startup.rel
 CLEANFILES += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/main.c ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
+    ../../shared/main.c ../../shared/sbrk.c \
+    ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
@@ -177,14 +178,6 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: ../shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
@@ -197,6 +190,14 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
+$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
+
+$(PROJECT_INCLUDE)/bsp/vectors.h: ../../powerpc/shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
+
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
index b47fa7a63f..65bcce40e9 100644
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
@@ -7,9 +7,9 @@ include $(top_srcdir)/../../../../automake/compile.am
 EXTRA_LIBRARIES = ../libbsp.a
 CLEANFILES = ../libbsp.a
 ___libbsp_a_SOURCES =
-___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel ../pclock$(LIB_VARIANT).rel \
-    ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \
-    ../vectors$(LIB_VARIANT).rel
+___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \
+    ../pclock$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \
+    ../irq$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel
 ___libbsp_a_LIBADD += \
     ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \
     ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \
diff --git a/contrib/cygwin/Makefile.am b/contrib/cygwin/Makefile.am
index 6eda75f2bc..c25005dd4f 100644
--- a/contrib/cygwin/Makefile.am
+++ b/contrib/cygwin/Makefile.am
@@ -3,7 +3,8 @@
 ##
 
 RPM_SPECS_DATA = i686-pc-cygwin-binutils.spec i686-pc-cygwin-libs.spec \
-    i686-pc-cygwin-mingw.spec i686-pc-cygwin-w32api.spec i686-pc-cygwin-gcc.spec
+    i686-pc-cygwin-mingw.spec i686-pc-cygwin-w32api.spec \
+    i686-pc-cygwin-gcc.spec
 
 CONFIGURE_DEPENDENCIES = setup.cache
 setup.cache: setup.def
diff --git a/cpukit/score/cpu/Makefile.am b/cpukit/score/cpu/Makefile.am
index 37e01b39bd..d02e1a24ea 100644
--- a/cpukit/score/cpu/Makefile.am
+++ b/cpukit/score/cpu/Makefile.am
@@ -4,8 +4,8 @@
 
 SUBDIRS = @RTEMS_CPU@
 
-DIST_SUBDIRS = arm c4x h8300 i386 m68k mips no_cpu or32 powerpc sh \
-    sparc unix
+DIST_SUBDIRS = arm c4x h8300 i386 m68k mips no_cpu or32 powerpc sh sparc \
+    unix
 DIST_SUBDIRS += avr
 
 include $(top_srcdir)/automake/subdirs.am
diff --git a/doc/FAQ/Makefile.am b/doc/FAQ/Makefile.am
index d4d86847ad..74ee479d3d 100644
--- a/doc/FAQ/Makefile.am
+++ b/doc/FAQ/Makefile.am
@@ -13,8 +13,7 @@ include $(top_srcdir)/project.am
 include $(top_srcdir)/main.am
 
 GENERATED_FILES = basic.texi tools.texi concepts.texi build45.texi bsp.texi \
-    debug.texi freesw.texi hwdebugaids.texi projects.texi \
-    endoftime.texi
+    debug.texi freesw.texi hwdebugaids.texi projects.texi endoftime.texi
 
 COMMON_FILES += $(top_srcdir)/common/cpright.texi
 
@@ -79,5 +78,5 @@ endoftime.texi: endoftime.t
 
 CLEANFILES += FAQ.info FAQ.info-?
 
-EXTRA_DIST = entry basic.t bsp.t build45.t concepts.t debug.t \
-    endoftime.t freesw.t hwdebugaids.t projects.t tools.t
+EXTRA_DIST = entry basic.t bsp.t build45.t concepts.t debug.t endoftime.t \
+    freesw.t hwdebugaids.t projects.t tools.t
diff --git a/make/Makefile.am b/make/Makefile.am
index 13c88b9c7f..da61a4e058 100644
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -23,14 +23,14 @@ dist_rtems_make_custom_DATA = custom/default.cfg
 EXTRA_DIST += custom/Cygwin-posix.cfg custom/FreeBSD-posix.cfg \
     custom/HPUX9-posix.cfg custom/Linux-posix.cfg custom/Solaris-posix.cfg \
     custom/bare.cfg custom/cvme961.cfg custom/dmv152.cfg custom/dmv177.cfg \
-    custom/erc32.cfg custom/erc32nfp.cfg \
-    custom/gen68302.cfg custom/gen68340.cfg custom/gen68360.cfg \
-    custom/gen68360_040.cfg custom/gensh1.cfg custom/helas403.cfg \
-    custom/i386ex.cfg custom/idp.cfg custom/jmr3904.cfg custom/leon1.cfg \
-    custom/leon2.cfg custom/mcp750.cfg custom/mvme136.cfg custom/mvme147.cfg \
-    custom/mvme147s.cfg custom/mvme162.cfg custom/mvme162lx.cfg \
-    custom/mvme167.cfg custom/mvme2100.cfg custom/mvme2307.cfg \
-    custom/no_bsp.cfg custom/ods68302.cfg custom/pc386.cfg custom/posix.cfg \
+    custom/erc32.cfg custom/erc32nfp.cfg custom/gen68302.cfg \
+    custom/gen68340.cfg custom/gen68360.cfg custom/gen68360_040.cfg \
+    custom/gensh1.cfg custom/helas403.cfg custom/i386ex.cfg custom/idp.cfg \
+    custom/jmr3904.cfg custom/leon1.cfg custom/leon2.cfg custom/mcp750.cfg \
+    custom/mvme136.cfg custom/mvme147.cfg custom/mvme147s.cfg \
+    custom/mvme162.cfg custom/mvme162lx.cfg custom/mvme167.cfg \
+    custom/mvme2100.cfg custom/mvme2307.cfg custom/no_bsp.cfg \
+    custom/ods68302.cfg custom/pc386.cfg custom/posix.cfg \
     custom/ppcn_60x.cfg custom/psim.cfg custom/score603e.cfg \
     custom/shsim.cfg custom/ts_386ex.cfg
 
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 752163a539..65bee8d69e 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -6,12 +6,12 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 
 noinst_HEADERS = include/pmacros.h
 
-POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \
-    psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
+POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
+    psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
 
 POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13 psxchroot01
 
-SUBDIRS =  $(POSIX_DIRS) $(POSIX_FILES_DIRS)
+SUBDIRS = $(POSIX_DIRS) $(POSIX_FILES_DIRS)
 
 EXTRA_DIST = psxtests.am
 
diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am
index d04b52f939..a71cbc4215 100644
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -6,9 +6,9 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 
 noinst_HEADERS = include/timesys.h
 
-SUBDIRS = tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 \
-    tm10 tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 tm23 \
-    tm24 tm25 tm26 tm27 tm28 tm29
+SUBDIRS = tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 tm10 \
+    tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 tm23 tm24 \
+    tm25 tm26 tm27 tm28 tm29
 
 EXTRA_DIST = tmtests.am