Ran ampolish after getting new version from Ralf Corsepius

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

Makefile.am

@@ -11,65 +11,30 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 SUBDIRS = doc make tools @TARGET_SUBDIRS@
 
-AUTOMAKE_FILES = \
-automake/subdirs.am \
-automake/local.am \
-automake/lib.am
+AUTOMAKE_FILES = automake/subdirs.am automake/local.am automake/lib.am
 
-ACLOCAL_FILES += \
-aclocal/ar-s.m4 \
-aclocal/bsp-alias.m4 \
-aclocal/canonical-host.m4 \
-aclocal/canonical-target-name.m4 \
-aclocal/canonicalize-tools.m4 \
-aclocal/check-bsps.m4 \
-aclocal/check-bsp-cache.m4 \
-aclocal/check-cpu.m4 \
-aclocal/check-cxx.m4 \
-aclocal/check-itron.m4 \
-aclocal/check-multiprocessing.m4 \
-aclocal/check-networking.m4 \
-aclocal/check-newlib.m4 \
-aclocal/check-posix.m4 \
-aclocal/check-rdbg.m4 \
-aclocal/enable-bare.m4 \
-aclocal/enable-cxx.m4 \
-aclocal/enable-gcc28.m4 \
-aclocal/enable-hwapi.m4 \
-aclocal/enable-inlines.m4 \
-aclocal/enable-itron.m4 \
-aclocal/enable-libcdir.m4 \
-aclocal/enable-multiprocessing.m4 \
-aclocal/enable-networking.m4 \
-aclocal/enable-posix.m4 \
-aclocal/enable-rdbg.m4 \
-aclocal/enable-rtemsbsp.m4 \
-aclocal/enable-tests.m4 \
-aclocal/gcc-pipe.m4 \
-aclocal/gcc-specs.m4 \
-aclocal/i386-gas-code16.m4 \
-aclocal/path-ksh.m4 \
-aclocal/path-perl.m4 \
-aclocal/prog-cc.m4 \
-aclocal/prog-cxx.m4 \
-aclocal/project-root.m4 \
-aclocal/rtems-top.m4 \
-aclocal/sysv-ipc.m4 \
-aclocal/target.m4 \
-aclocal/tool-paths.m4 \
-aclocal/tool-prefix.m4
+ACLOCAL_FILES += aclocal/ar-s.m4 aclocal/bsp-alias.m4 \
+    aclocal/canonical-host.m4 aclocal/canonical-target-name.m4 \
+    aclocal/canonicalize-tools.m4 aclocal/check-bsps.m4 \
+    aclocal/check-bsp-cache.m4 aclocal/check-cpu.m4 aclocal/check-cxx.m4 \
+    aclocal/check-itron.m4 aclocal/check-multiprocessing.m4 \
+    aclocal/check-networking.m4 aclocal/check-newlib.m4 \
+    aclocal/check-posix.m4 aclocal/check-rdbg.m4 aclocal/enable-bare.m4 \
+    aclocal/enable-cxx.m4 aclocal/enable-gcc28.m4 aclocal/enable-hwapi.m4 \
+    aclocal/enable-inlines.m4 aclocal/enable-itron.m4 \
+    aclocal/enable-libcdir.m4 aclocal/enable-multiprocessing.m4 \
+    aclocal/enable-networking.m4 aclocal/enable-posix.m4 \
+    aclocal/enable-rdbg.m4 aclocal/enable-rtemsbsp.m4 \
+    aclocal/enable-tests.m4 aclocal/gcc-pipe.m4 aclocal/gcc-specs.m4 \
+    aclocal/i386-gas-code16.m4 aclocal/path-ksh.m4 aclocal/path-perl.m4 \
+    aclocal/prog-cc.m4 aclocal/prog-cxx.m4 aclocal/project-root.m4 \
+    aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 aclocal/target.m4 \
+    aclocal/tool-paths.m4 aclocal/tool-prefix.m4
 
-noinst_SCRIPTS = \
-bootstrap
+noinst_SCRIPTS = bootstrap
 
-EXTRA_DIST = \
-$(AUTOMAKE_FILES) \
-$(ACLOCAL_FILES) \
-README.configure \
-SUPPORT \
-VERSION \
-LICENSE \
-$(noinst_SCRIPTS)
+EXTRA_DIST = $(AUTOMAKE_FILES) $(ACLOCAL_FILES) README.configure SUPPORT \
+    VERSION LICENSE $(noinst_SCRIPTS)
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(ACLOCAL_FILES)
 

c/Makefile.am

@@ -4,6 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
 ## NOTE: This Makefile.am is rather fragile to the value of RTEMS_BSP
 ## Esp. make clean and make distclean have unwanted side-effects
 ## if RTEMS_BSP is not properly set up.
@@ -11,10 +12,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 RTEMS_BSP = $(RTEMS_BSP_LIST)
 ## The '.' in SUBDIRS ensures that local make-targets (xxx-am) will be
 ## triggered before $(RTEMS_BSP_LIST) subdirectories are made.
-SUBDIRS= \
-make \
-. \
-$(RTEMS_BSP)
+SUBDIRS = make . $(RTEMS_BSP)
 
 ## Use @RTEMS_BSP_LIST@ here, using $(RTEMS_BSP_LIST) would trigger
 ## this rule for invalid BSPs
@@ -31,20 +29,12 @@ $(RTEMS_BSP)
 
 ## Let all RTEMS' make targets depend on ${RTEMS_BSP}
 all-am: ${RTEMS_BSP}
-debug-am: ${RTEMS_BSP}
-profile-am: ${RTEMS_BSP}
 preinstall-am: ${RTEMS_BSP}
 depend-am: ${RTEMS_BSP}
 
 ## Pull in extra files intro the distribution
-EXTRA_DIST = \
-ACKNOWLEDGEMENTS \
-README.DOS \
-REQUIRES \
-PROBLEMS \
-TESTED \
-README \
-UPDATE_HELP
+EXTRA_DIST = ACKNOWLEDGEMENTS README.DOS REQUIRES PROBLEMS TESTED README \
+    UPDATE_HELP
 
 DIST_SUBDIRS = ${RTEMS_BSP}
 ## -------------------------------------------------------

c/src/Makefile.am

@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS= @cfg_subdirs@ wrapup tests
+SUBDIRS = @cfg_subdirs@ wrapup tests
 
-rtems_bspdir=$(prefix)/@RTEMS_BSP@
+rtems_bspdir = $(prefix)/@RTEMS_BSP@
 
 # NOTE: The wildcard on the install should pick up everything except
 #       the tests directory.  This significantly minimizes the install size.

c/src/exec/itron/include/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = itron.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -18,8 +17,6 @@ $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems itronsys
 

c/src/exec/itron/include/itronsys/Makefile.am

@@ -4,14 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h \
-    port.h semaphore.h status.h sysmgmt.h task.h time.h types.h vmempool.h
+H_FILES = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h port.h \
+    semaphore.h status.h sysmgmt.h task.h time.h types.h vmempool.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/itronsys \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%)
 
 $(PROJECT_INCLUDE)/itronsys:
 	@$(mkinstalldirs) $@
@@ -19,7 +18,5 @@ $(PROJECT_INCLUDE)/itronsys/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/local.am

c/src/exec/itron/include/rtems/itron/Makefile.am

@@ -5,14 +5,13 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \
-    msgbuffer.h network.h object.h port.h semaphore.h sysmgmt.h \
-    task.h time.h vmempool.h
+    msgbuffer.h network.h object.h port.h semaphore.h sysmgmt.h task.h \
+    time.h vmempool.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/itron \
-$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
 
 $(PROJECT_INCLUDE)/rtems/itron:
 	@$(mkinstalldirs) $@
@@ -20,8 +19,6 @@ $(PROJECT_INCLUDE)/rtems/itron/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 EXTRA_DIST = README
 

c/src/exec/itron/inline/rtems/itron/Makefile.am

@@ -3,16 +3,16 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 if INLINE
 I_FILES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \
-    network.inl port.inl semaphore.inl sysmgmt.inl task.inl \
-    time.inl vmempool.inl
+    network.inl port.inl semaphore.inl sysmgmt.inl task.inl time.inl \
+    vmempool.inl
 
 noinst_HEADERS = $(I_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/itron \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
 
 $(PROJECT_INCLUDE)/rtems/itron:
 	@$(mkinstalldirs) $@
@@ -21,7 +21,5 @@ $(PROJECT_INCLUDE)/rtems/itron/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/local.am

c/src/exec/itron/src/Makefile.am

@@ -18,9 +18,9 @@ EVENTFLAGS_C_FILES = eventflags.c
 
 MAILBOX_C_FILES = mbox.c
 
-MSGBUFFER_C_FILES = msgbuffer.c msgbuffertranslatereturncode.c \
-    cre_mbf.c del_mbf.c prcv_mbf.c psnd_mbf.c rcv_mbf.c ref_mbf.c snd_mbf.c \
-    trcv_mbf.c tsnd_mbf.c
+MSGBUFFER_C_FILES = msgbuffer.c msgbuffertranslatereturncode.c cre_mbf.c \
+    del_mbf.c prcv_mbf.c psnd_mbf.c rcv_mbf.c ref_mbf.c snd_mbf.c trcv_mbf.c \
+    tsnd_mbf.c
 
 RENDEZVOUS_C_FILES = port.c
 
@@ -53,16 +53,8 @@ AM_CFLAGS += $(CFLAGS_OS_V)
 
 all: ${ARCH} ${OBJS}
 
-UNUSED_C_FILES = \
-cre_mbx.c del_mbx.c \
-mboxtranslatereturncode.c \
-network.c \
-prcv_mbx.c \
-rcv_mbx.c \
-ref_mbx.c \
-snd_mbx.c \
-sysmgmt.c \
-trcv_mbx.c
+UNUSED_C_FILES = cre_mbx.c del_mbx.c mboxtranslatereturncode.c network.c \
+    prcv_mbx.c rcv_mbx.c ref_mbx.c snd_mbx.c sysmgmt.c trcv_mbx.c
 
 EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES)
 

c/src/exec/posix/include/Makefile.am

@@ -11,9 +11,8 @@ H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -21,8 +20,6 @@ $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems sys
 

c/src/exec/posix/include/rtems/posix/Makefile.am

@@ -10,7 +10,7 @@ STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
     priority.h psignal.h pthread.h ptimer.h semaphore.h seterr.h threadsup.h \
     time.h timer.h $(MP_H_FILES)
 
-UNUSED_H_FILES= intr.h threadsup.h
+UNUSED_H_FILES = intr.h threadsup.h
 
 if HAS_MP
 H_FILES = $(STD_H_FILES) $(MP_H_FILES)
@@ -20,9 +20,8 @@ endif
 
 noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/posix \
-$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
 
 $(PROJECT_INCLUDE)/rtems/posix:
 	@$(mkinstalldirs) $@
@@ -30,8 +29,6 @@ $(PROJECT_INCLUDE)/rtems/posix/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 EXTRA_DIST = $(UNUSED_H_FILES)
 

c/src/exec/posix/include/sys/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = utsname.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/sys \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
 
 $(PROJECT_INCLUDE)/sys:
 	@$(mkinstalldirs) $@
@@ -18,7 +17,5 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/local.am

c/src/exec/posix/inline/rtems/posix/Makefile.am

@@ -3,6 +3,7 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 #I_FILES= intr.inl
 I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
     semaphore.inl
@@ -10,9 +11,8 @@ I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
 noinst_HEADERS = $(I_FILES)
 
 if INLINE
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/posix \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
 
 $(PROJECT_INCLUDE)/rtems/posix:
 	@$(mkinstalldirs) $@
@@ -21,8 +21,6 @@ $(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 EXTRA_DIST = intr.inl
 

c/src/exec/posix/macros/rtems/posix/Makefile.am

@@ -9,9 +9,8 @@ I_FILES =
 
 noinst_HEADERS = $(I_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/posix \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
 
 $(PROJECT_INCLUDE)/rtems/posix:
 	@$(mkinstalldirs) $@
@@ -20,7 +19,5 @@ $(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/local.am

c/src/exec/posix/optman/Makefile.am

@@ -13,7 +13,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../automake/lib.am
 
 TMPINSTALL_FILES += \
-$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+    $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
 
 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@

c/src/exec/rtems/include/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = rtems.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -18,8 +17,6 @@ $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems
 

c/src/exec/rtems/include/rtems/rtems/Makefile.am

@@ -5,12 +5,12 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 ## We only build multiprocessing related files if HAS_MP was defined
-MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \
-    signalmp.h taskmp.h
+MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h signalmp.h \
+    taskmp.h
 
-STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
-    message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \
-    signal.h status.h support.h tasks.h timer.h types.h
+STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h \
+    intr.h message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h \
+    sem.h signal.h status.h support.h tasks.h timer.h types.h
 
 if HAS_MP
 H_FILES = $(STD_H_FILES) $(MP_H_FILES)
@@ -20,9 +20,8 @@ endif
 
 noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/rtems \
-$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems/rtems:
 	@$(mkinstalldirs) $@
@@ -30,7 +29,5 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/rtems/inline/rtems/rtems/Makefile.am

@@ -6,14 +6,13 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 if INLINE
 I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
-    modes.inl options.inl part.inl ratemon.inl \
-    region.inl sem.inl status.inl support.inl tasks.inl timer.inl
+    modes.inl options.inl part.inl ratemon.inl region.inl sem.inl status.inl \
+    support.inl tasks.inl timer.inl
 
 noinst_HEADERS = $(I_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems/rtems:
 	@$(mkinstalldirs) $@
@@ -22,7 +21,5 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/rtems/macros/rtems/rtems/Makefile.am

@@ -5,16 +5,15 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
-    modes.inl options.inl part.inl ratemon.inl \
-    region.inl sem.inl status.inl support.inl tasks.inl timer.inl
+    modes.inl options.inl part.inl ratemon.inl region.inl sem.inl status.inl \
+    support.inl tasks.inl timer.inl
 
 noinst_HEADERS = $(I_FILES)
 
 if MACROS
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/rtems \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems/rtems:
 	@$(mkinstalldirs) $@
@@ -23,7 +22,5 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/rtems/optman/Makefile.am

@@ -14,7 +14,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
 TMPINSTALL_FILES += \
-$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+    $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
 
 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@

c/src/exec/rtems/src/Makefile.am

@@ -42,7 +42,7 @@ SIGNAL_C_FILES = signal.c signalcatch.c signalsend.c
 
 REGION_C_FILES = region.c regioncreate.c regiondelete.c regionextend.c \
     regiongetsegment.c regiongetsegmentsize.c regionident.c \
-    regionreturnsegment.c regionreturnsegment.c
+    regionreturnsegment.c
 
 PARTITION_C_FILES = part.c partcreate.c partdelete.c partgetbuffer.c \
     partident.c partreturnbuffer.c

c/src/exec/sapi/include/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = confdefs.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -18,8 +17,6 @@ $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems
 

c/src/exec/sapi/include/rtems/Makefile.am

@@ -9,9 +9,8 @@ H_FILES = config.h directives.h extension.h fatal.h init.h io.h mptables.h \
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -21,7 +20,5 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
 EXTRA_DIST = README
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/sapi/inline/rtems/Makefile.am

@@ -9,9 +9,8 @@ I_FILES = extension.inl
 
 noinst_HEADERS = $(I_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -20,7 +19,5 @@ $(PROJECT_INCLUDE)/rtems/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/sapi/macros/rtems/Makefile.am

@@ -9,9 +9,8 @@ I_FILES = extension.inl
 noinst_HEADERS = $(I_FILES)
 
 if MACROS
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -20,7 +19,5 @@ $(PROJECT_INCLUDE)/rtems/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/sapi/optman/Makefile.am

@@ -13,7 +13,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
 TMPINSTALL_FILES += \
-$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+    $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
 
 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@

c/src/exec/score/cpu/a29k/Makefile.am

@@ -41,7 +41,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/a29k/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/hppa1.1/Makefile.am

@@ -36,7 +36,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/i386/Makefile.am

@@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/i386/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/i960/Makefile.am

@@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/i960/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/m68k/Makefile.am

@@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/m68k/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/mips64orion/Makefile.am

@@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/no_cpu/Makefile.am

@@ -35,7 +35,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am

@@ -21,11 +21,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(PROJECT_INCLUDE)/rtems/score \
-$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
-$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
+    $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
+    $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
 
 ##TMPINSTALL_FILES += \
 ##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
@@ -58,7 +56,6 @@ all: $(TMPINSTALL_FILES)
 clean-local:
 	$(RM) -r ../o-optimize ../o-debug ../o-profile
 
-EXTRA_DIST = \
-$(C_FILES) $(S_FILES)
+EXTRA_DIST = $(C_FILES) $(S_FILES)
 
 include $(top_srcdir)/../../../../../../automake/local.am

c/src/exec/score/cpu/powerpc/old_exception_processing/Makefile.am

@@ -19,14 +19,11 @@ S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/lib.am
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(PROJECT_INCLUDE)/rtems/score \
-$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
-$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
+    $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
+    $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
@@ -58,9 +55,6 @@ clean-local:
 
 UNUSED_FILES = irq_stub.S
 
-EXTRA_DIST = \
-TODO \
-rtems.S \
-$(C_FILES) $(S_FILES) $(UNUSED_FILES)
+EXTRA_DIST = TODO rtems.S $(C_FILES) $(S_FILES) $(UNUSED_FILES)
 
 include $(top_srcdir)/../../../../../../automake/local.am

c/src/exec/score/cpu/powerpc/shared/Makefile.am

@@ -12,11 +12,9 @@ noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(PROJECT_INCLUDE)/rtems/score \
-$(ROOT_H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
-$(RTEMS_SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
+    $(ROOT_H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
+    $(RTEMS_SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/sh/Makefile.am

@@ -35,7 +35,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/sh/rtems/score/Makefile.am

@@ -6,18 +6,15 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = cpu.h shtypes.h sh.h sh_io.h isp$(RTEMS_CPU_MODEL).h \
     io$(RTEMS_CPU_MODEL).h
-noinst_HEADERS = \
-    cpu.h shtypes.h sh.h sh_io.h \
-    iosh7032.h ispsh7032.h \
+noinst_HEADERS = cpu.h shtypes.h sh.h sh_io.h iosh7032.h ispsh7032.h \
     iosh7045.h ispsh7045.h
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/sparc/Makefile.am

@@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 

c/src/exec/score/cpu/sparc/rtems/score/Makefile.am

@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/cpu/unix/rtems/score/Makefile.am

@@ -20,10 +20,9 @@ unixsize.h: $(GENSIZE) cpu.h
 
 CLEANFILES = unixsize.h
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
-$(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
+    $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@

c/src/exec/score/include/rtems/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = debug.h system.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -18,8 +17,6 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = score
 

c/src/exec/score/include/rtems/score/Makefile.am

@@ -11,10 +11,10 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h
 
 # H_FILES that get installed in the rtems/score subdirectoy
-STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h coremsg.h \
-    coremutex.h coresem.h heap.h interr.h isr.h object.h priority.h stack.h \
-    states.h sysstate.h thread.h threadq.h tod.h tqdata.h userext.h \
-    watchdog.h wkspace.h
+STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h \
+    coremsg.h coremutex.h coresem.h heap.h interr.h isr.h object.h \
+    priority.h stack.h states.h sysstate.h thread.h threadq.h tod.h tqdata.h \
+    userext.h watchdog.h wkspace.h
 TARGOPTS = targopts.h
 
 if HAS_MP
@@ -23,9 +23,8 @@ else
 H_FILES = $(STD_H_FILES) $(TARGOPTS)
 endif
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	@$(mkinstalldirs) $@

c/src/exec/score/inline/rtems/score/Makefile.am

@@ -21,9 +21,8 @@ endif
 noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
 
 if INLINE
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	@$(mkinstalldirs) $@
@@ -32,7 +31,5 @@ $(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/score/macros/rtems/score/Makefile.am

@@ -7,9 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
 ## We only build multiprocessing related files if HAS_MP was defined
 MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
 
-STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \
-    isr.inl object.inl priority.inl stack.inl states.inl sysstate.inl \
-    thread.inl tod.inl tqdata.inl userext.inl watchdog.inl wkspace.inl
+STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
+    heap.inl isr.inl object.inl priority.inl stack.inl states.inl \
+    sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
+    wkspace.inl
 
 noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
 
@@ -20,9 +21,8 @@ else
 I_FILES = $(STD_I_FILES
 endif
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score%)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	@$(mkinstalldirs) $@
@@ -31,7 +31,5 @@ $(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl
 endif
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/exec/wrapup/itron/Makefile.am

@@ -21,8 +21,7 @@ OBJS = $(ITRON_OBJS)
 $(LIB): ${OBJS}
 	$(make-library)
 
-ITRON_LIB = \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+ITRON_LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@

c/src/exec/wrapup/posix/Makefile.am

@@ -21,8 +21,7 @@ OBJS = $(POSIX_OBJS)
 $(LIB): ${OBJS}
 	$(make-library)
 
-POSIX_LIB = \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+POSIX_LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@

c/src/exec/wrapup/rtems/Makefile.am

@@ -25,8 +25,7 @@ $(LIB): ${OBJS}
 	 $(SIZE_RTEMS) @RTEMS_BSP@ $(ARCH) \
 	 >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@

c/src/lib/Makefile.am

@@ -5,8 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = include libc libcpu libbsp \
-    $(LIBHWAPI)
+SUBDIRS = include libc libcpu libbsp $(LIBHWAPI)
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/include/Makefile.am

@@ -9,9 +9,8 @@ H_FILES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -19,8 +18,6 @@ $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = sys motorola zilog
 

c/src/lib/include/motorola/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = mc68230.h mc68681.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/motorola \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%)
 
 $(PROJECT_INCLUDE)/motorola:
 	@$(mkinstalldirs) $@
@@ -18,7 +17,5 @@ $(PROJECT_INCLUDE)/motorola/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/include/sys/Makefile.am

@@ -18,9 +18,8 @@ H_FILES = utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
 
 noinst_HEADERS = utime.h termios.h ioctl.h
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/sys \
-$(H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
 
 $(PROJECT_INCLUDE)/sys:
 	@$(mkinstalldirs) $@
@@ -28,7 +27,5 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/include/zilog/Makefile.am

@@ -8,9 +8,8 @@ H_FILES = z8036.h z8530.h z8536.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/zilog \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%)
 
 $(PROJECT_INCLUDE)/zilog:
 	@$(mkinstalldirs) $@
@@ -18,7 +17,5 @@ $(PROJECT_INCLUDE)/zilog/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am

@@ -5,11 +5,9 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-noinst_PROGRAMS= \
-print_dump
+noinst_PROGRAMS = print_dump
 
-print_dump_SOURCES= \
-print_dump.c
+print_dump_SOURCES = print_dump.c
 
 ## HACK: install to build-tree
 install-exec-local: $(PROGRAMS)

c/src/lib/libbsp/i386/pc386/3c509/Makefile.am

@@ -23,7 +23,6 @@ AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 $(PGM): $(X3c509_rel_OBJECTS)
 	$(make-rel)
 
-
 # the .rel file built here will be put into libbsp.a by
 # 	../wrapup/Makefile
 

c/src/lib/libbsp/i386/pc386/tools/Makefile.am

@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 EXTRA_DIST = Spec.doc
 
-noinst_PROGRAMS = \
-bin2boot
+noinst_PROGRAMS = bin2boot
 
 bin2boot_SOURCES = bin2boot.c
 
@@ -18,9 +17,8 @@ bin2boot_SOURCES = bin2boot.c
 @PROJECT_RELEASE@/build-tools/bin2boot$(EXEEXT): bin2boot$(EXEEXT)
 	$(INSTALL_PROGRAM) $< $@
 
-PREINSTALL_FILES = \
-@PROJECT_RELEASE@/build-tools \
-@PROJECT_RELEASE@/build-tools/bin2boot$(EXEEXT)
+PREINSTALL_FILES += @PROJECT_RELEASE@/build-tools \
+    @PROJECT_RELEASE@/build-tools/bin2boot$(EXEEXT)
 
 ## HACK: install into build-tree
 all-local: $(PREINSTALL_FILES)

c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am

@@ -5,19 +5,11 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-noinst_SCRIPTS = \
-coff2bin \
-elf2exe
+noinst_SCRIPTS = coff2bin elf2exe
 
-SUBDIRS = \
-ts_1325_ada \
-network_ada \
-debug_ada \
-debug_c \
-dos_sup
+SUBDIRS = ts_1325_ada network_ada debug_ada debug_c dos_sup
 
-EXTRA_DIST = \
-$(noinst_SCRIPTS)
+EXTRA_DIST = $(noinst_SCRIPTS)
 
 include $(top_srcdir)/../../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../../automake/host.am

c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am

@@ -4,13 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-Makefile.ts_386ex \
-cmds \
-ddd-rtems \
-debug.adb \
-init.c \
-serial_debug.adb \
-serial_debug.ads
+EXTRA_DIST = Makefile.ts_386ex cmds ddd-rtems debug.adb init.c \
+    serial_debug.adb serial_debug.ads
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am

@@ -4,13 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-cmds \
-ddd-rtems \
-debug_test.c \
-init.c \
-serial_gdb.c \
-serial_gdb.h \
-system.h
+EXTRA_DIST = cmds ddd-rtems debug_test.c init.c serial_gdb.c serial_gdb.h \
+    system.h
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am

@@ -4,9 +4,6 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-loader.com \
-loader_hybrid_com.asm \
-ts1325.inc
+EXTRA_DIST = loader.com loader_hybrid_com.asm ts1325.inc
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am

@@ -6,9 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 SUBDIRS = adasockets listener tcprelay
 
-EXTRA_DIST = \
-README \
-networkconfig.h
+EXTRA_DIST = README networkconfig.h
 
 include $(top_srcdir)/../../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am

@@ -4,21 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-AUTHORS \
-COPYING \
-NEWS \
-README \
-sockets-constants.ads \
-sockets-link.ads \
-sockets-multicast.adb \
-sockets-multicast.ads \
-sockets-naming.adb \
-sockets-naming.ads \
-sockets-thin.ads \
-sockets-utils.adb \
-sockets-utils.ads \
-sockets.adb \
-sockets.ads
+EXTRA_DIST = AUTHORS COPYING NEWS README sockets-constants.ads \
+    sockets-link.ads sockets-multicast.adb sockets-multicast.ads \
+    sockets-naming.adb sockets-naming.ads sockets-thin.ads sockets-utils.adb \
+    sockets-utils.ads sockets.adb sockets.ads
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am

@@ -4,9 +4,6 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-Makefile.ts_386ex \
-init.c \
-listener.adb
+EXTRA_DIST = Makefile.ts_386ex init.c listener.adb
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am

@@ -4,10 +4,6 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-Makefile.ts_386ex \
-init.c \
-print_error.c \
-tcprelay.adb
+EXTRA_DIST = Makefile.ts_386ex init.c print_error.c tcprelay.adb
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am

@@ -4,18 +4,8 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = \
-Makefile.ts_386ex \
-ts1325-button.adb  \
-ts1325-parallel.adb \
-i386_ports.adb \
-ts1325-button.ads \
-ts1325-parallel.ads \
-i386_ports.ads \
-ts1325-led.adb \
-ts1325.ads \
-init.c \
-ts1325-led.ads \
-ts1325_test.adb
+EXTRA_DIST = Makefile.ts_386ex ts1325-button.adb ts1325-parallel.adb \
+    i386_ports.adb ts1325-button.ads ts1325-parallel.ads i386_ports.ads \
+    ts1325-led.adb ts1325.ads init.c ts1325-led.ads ts1325_test.adb
 
 include $(top_srcdir)/../../../../../../../automake/local.am

c/src/lib/libbsp/m68k/efi332/startup/Makefile.am

@@ -33,7 +33,8 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 $(PROJECT_RELEASE)/lib/linkcmds_ROM: linkcmds_ROM
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).o: $(ARCH)/except_vect_332_ROM.o
+$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).o: \
+    $(ARCH)/except_vect_332_ROM.o
 	$(INSTALL_DATA) $< $@
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile

c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am

@@ -8,8 +8,7 @@ BSP_PIECES = startup clock console timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-    $(wildcard \
-    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am

@@ -13,8 +13,7 @@ BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-    $(wildcard \
-    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am

@@ -4,8 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-VPATH = \
-    @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/../../../shared
 
 PGM = $(ARCH)/startup.rel
 

c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am

@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-noinst_PROGRAMS=sload
+noinst_PROGRAMS = sload
 
 sload_SOURCES = sload.c
 

c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am

@@ -9,9 +9,7 @@ BSP_PIECES = startup clock console timer tod
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     $(wildcard ../consolex/$(ARCH)/consolex.rel) \
-    $(wildcard \
-    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
-
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 
 LIB = $(ARCH)/libbsp.a
 

c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am

@@ -8,8 +8,7 @@ BSP_PIECES = clock console fatal startup timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-    $(wildcard \
-    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 
 LIB = $(ARCH)/libbsp.a
 

c/src/lib/libbsp/powerpc/dmv177/Makefile.am

@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include clock console startup start timer scv64 tod \
-    sonic wrapup
+SUBDIRS = include clock console startup start timer scv64 tod sonic wrapup
 
 include $(top_srcdir)/../../bsp.am
 

c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am

@@ -16,7 +16,6 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
 OBJS = $(S_O_FILES) $(C_O_FILES)
 
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/lib.am
 

c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am

@@ -4,8 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-VPATH = \
-    @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
+VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
 
 C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.c \
     gnatinstallhandler.c

c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am

@@ -9,8 +9,8 @@ if HAS_NETWORKING
 NETWORK = network
 endif
 
-BSP_PIECES = startup clock console timer tod $(NETWORK) nvram \
-    universe pci vectors
+BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \
+    vectors
 # pieces to pick up out of libcpu/$(RTEMS_CPU)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x

c/src/lib/libbsp/powerpc/psim/Makefile.am

@@ -7,8 +7,8 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include start clock console startup shmsupp timer vectors \
-    wrapup tools
+SUBDIRS = include start clock console startup shmsupp timer vectors wrapup \
+    tools
 
 include $(top_srcdir)/../../bsp.am
 

c/src/lib/libbsp/powerpc/psim/tools/Makefile.am

@@ -5,11 +5,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-noinst_SCRIPTS=psim runtest
+noinst_SCRIPTS = psim runtest
 
-TMPINSTALL_FILES = $(PROJECT_ROOT)/psim/tests \
-   $(PROJECT_ROOT)/psim/tests/runtest \
-   $(PROJECT_ROOT)/psim/tests/psim \
+TMPINSTALL_FILES += $(PROJECT_ROOT)/psim/tests \
+    $(PROJECT_ROOT)/psim/tests/runtest $(PROJECT_ROOT)/psim/tests/psim \
     $(PROJECT_ROOT)/psim/tests/psim-gdb
 
 $(PROJECT_ROOT)/psim/tests:

c/src/lib/libbsp/sh/gensh1/startup/Makefile.am

@@ -4,10 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = $(ARCH)/startup.rel
-
 VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
 
+PGM = $(ARCH)/startup.rel
+
 C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c sbrk.c bootcard.c main.c \
     gnatinstallhandler.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)

c/src/lib/libbsp/sparc/erc32/tools/Makefile.am

@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-noinst_SCRIPTS=runtest
+noinst_SCRIPTS = runtest
 
-TMPINSTALL_FILES = $(PROJECT_ROOT)/erc32/tests \
+TMPINSTALL_FILES += $(PROJECT_ROOT)/erc32/tests \
     $(PROJECT_ROOT)/erc32/tests/runtest
 
 $(PROJECT_ROOT)/erc32/tests:

c/src/lib/libbsp/unix/posix/startup/Makefile.am

@@ -4,10 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/startup.rel
-
 VPATH = @srcdir@:@srcdir@/../../../shared
 
+PGM = ${ARCH}/startup.rel
+
 if HAS_CXX
 C_MAIN_C_FILES =
 else
@@ -48,8 +48,7 @@ $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o: $(ARCH)/rtems-ctor.o
 	$(INSTALL_DATA) $< $@
 
 if HAS_CXX
-all: $(ARCH) $(PGM) \
-	$(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \
+all: $(ARCH) $(PGM) $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \
     $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o
 else
 all: $(ARCH) $(PGM)

c/src/lib/libbsp/unix/posix/tools/Makefile.am

@@ -7,12 +7,11 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 if PERL
 perl_scripts = shmdump semdump
-PERL_TMPINSTALL_FILES = \
-  $(PROJECT_ROOT)/posix/tests/shmdump \
+PERL_TMPINSTALL_FILES = $(PROJECT_ROOT)/posix/tests/shmdump \
     $(PROJECT_ROOT)/posix/tests/semdump
 endif
 
-noinst_SCRIPTS=runtest looptest $(perl_scripts)
+noinst_SCRIPTS = runtest looptest $(perl_scripts)
 
 $(PROJECT_ROOT)/posix/tests:
 	$(mkinstalldirs) $@
@@ -29,9 +28,8 @@ $(PROJECT_ROOT)/posix/tests/shmdump: shmdump
 $(PROJECT_ROOT)/posix/tests/semdump: semdump
 	$(INSTALL_SCRIPT) $< $@
 
-TMPINSTALL_FILES = $(PROJECT_ROOT)/posix/tests \
-   $(PROJECT_ROOT)/posix/tests/runtest \
-   $(PROJECT_ROOT)/posix/tests/looptest
+TMPINSTALL_FILES += $(PROJECT_ROOT)/posix/tests \
+    $(PROJECT_ROOT)/posix/tests/runtest $(PROJECT_ROOT)/posix/tests/looptest
 
 ## HACK: install to build-tree
 all-local: $(TMPINSTALL_FILES) $(PERL_TMPINSTALL_FILES)

c/src/lib/libc/Makefile.am

@@ -48,15 +48,14 @@ LIBC_GLUE_C_FILES = __getpid.c __gettod.c __times.c truncate.c access.c \
 
 UNIX_LIBC_C_FILES = unixlibc.c hosterr.c
 
-COMMON_C_FILES = $(BASE_FS_C_FILES)  $(MALLOC_C_FILES) \
-    $(TERMIOS_C_FILES) $(ERROR_C_FILES) $(ASSOCIATION_C_FILES)
+COMMON_C_FILES = $(BASE_FS_C_FILES) $(MALLOC_C_FILES) $(TERMIOS_C_FILES) \
+    $(ERROR_C_FILES) $(ASSOCIATION_C_FILES)
 
 UNIX_C_FILES = $(UNIX_LIBC_C_FILES) imfs_unixstub.c
 
-EMBEDDED_C_FILES = $(LIBC_GLUE_C_FILES) \
-    $(PASSWORD_GROUP_C_FILES) $(TERMINAL_IDENTIFICATION_C_FILES) \
-    $(SYSTEM_CALL_C_FILES) $(DIRECTORY_SCAN_C_FILES) \
-    $(IMFS_C_FILES)
+EMBEDDED_C_FILES = $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \
+    $(TERMINAL_IDENTIFICATION_C_FILES) $(SYSTEM_CALL_C_FILES) \
+    $(DIRECTORY_SCAN_C_FILES) $(IMFS_C_FILES)
 
 if UNIX
 C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
@@ -73,13 +72,10 @@ noinst_HEADERS = libio_.h
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(PROJECT_INCLUDE)/rtems \
-$(PROJECT_INCLUDE)/sys \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%) \
-$(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
-$(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
+    $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/%) \
+    $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
+    $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -95,8 +91,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
 $(PROJECT_INCLUDE)/sys/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 OBJS = $(C_O_FILES)
 
@@ -116,9 +111,7 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 
 DOC_FILES = TODO CASES
 
-EXTRA_DIST = \
-$(DOC_FILES) \
-$(COMMON_C_FILES) $(EMBEDDED_C_FILES) $(UNIX_C_FILES) \
-$(H_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
+EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
+    $(UNIX_C_FILES) $(H_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/libcpu/a29k/clock/Makefile.am

@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM=$(ARCH)/clock.rel
+PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)

c/src/lib/libcpu/a29k/timer/Makefile.am

@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM=$(ARCH)/timer.rel
+PGM = $(ARCH)/timer.rel
 
 # NOTE: timerisr is normally an assembly file!!!
 

c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am

@@ -4,9 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-## FIXME
 VPATH = @srcdir@:@srcdir@/../../ppc403/vectors
 
+## FIXME
+
 PGM = ${ARCH}/vectors.rel
 
 ## Assembly sources

c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am

@@ -9,9 +9,9 @@ PROC_SPECIFIC_O_FILES = exceptions mmu
 GENERIC_FILES =
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(PROC_SPECIFIC_O_FILES), \
-    ../../mpc6xx/$(piece)/$(ARCH)/*.o) $(foreach piece, $(GENERIC_FILES), \
-    ../../mpc6xx/$(piece)/$(ARCH)/*.o)
+OBJS = \
+    $(foreach piece, $(PROC_SPECIFIC_O_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.o) \
+    $(foreach piece, $(GENERIC_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.o)
 LIB = $(ARCH)/libcpuspec.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg