Merged from 4.5.0-beta3a

9 files changed, 22 insertions, 42 deletions

diff --git a/c/src/librdbg/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am
index d47897ff43..20557ec68e 100644
--- a/c/src/librdbg/include/rdbg/Makefile.am
+++ b/c/src/librdbg/include/rdbg/Makefile.am
@@ -9,9 +9,8 @@ H_FILES = rdbg.h servrpc.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rdbg \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
 
 $(PROJECT_INCLUDE)/rdbg:
 	@$(mkinstalldirs) $@
@@ -19,9 +18,7 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h
 	$(INSTALL_DATA) $< $@
 endif
 
-all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 if HAS_RDBG
 SUBDIRS = $(RTEMS_CPU)
diff --git a/c/src/librdbg/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am
index 22246c94ec..df70315c7a 100644
--- a/c/src/librdbg/include/rdbg/i386/Makefile.am
+++ b/c/src/librdbg/include/rdbg/i386/Makefile.am
@@ -17,17 +17,14 @@ noinst_HEADERS = $(H_FILES)
 ##$(PROJECT_INCLUDE)/rdbg/i386/%.h: %.h
 ##	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rdbg \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
 
 $(PROJECT_INCLUDE)/rdbg:
 	@$(mkinstalldirs) $@
 $(PROJECT_INCLUDE)/rdbg/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am
index b5b502bf3b..7eec4212a3 100644
--- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am
+++ b/c/src/librdbg/include/rdbg/powerpc/Makefile.am
@@ -17,17 +17,14 @@ noinst_HEADERS = $(H_FILES)
 ##$(PROJECT_INCLUDE)/rdbg/powerpc/%.h: %.h
 ##	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rdbg \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
 
 $(PROJECT_INCLUDE)/rdbg:
 	@$(mkinstalldirs) $@
 $(PROJECT_INCLUDE)/rdbg/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am
index 3e41bfc8ad..73809bcc2d 100644
--- a/c/src/librdbg/src/Makefile.am
+++ b/c/src/librdbg/src/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am
index 9fec02b48f..aa85593479 100644
--- a/c/src/librdbg/src/i386/Makefile.am
+++ b/c/src/librdbg/src/i386/Makefile.am
@@ -6,8 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 SUBDIRS = any
 
-EXTRA_DIST = \
-excep_f.c rdbg_cpu_asm.S rdbg_f.c
+EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/src/i386/any/Makefile.am b/c/src/librdbg/src/i386/any/Makefile.am
index 13e1743c61..451f3ec960 100644
--- a/c/src/librdbg/src/i386/any/Makefile.am
+++ b/c/src/librdbg/src/i386/any/Makefile.am
@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES += $(H_FILES) $(GEN_C_FILES)
 
 FRONTEND = \"$(RTEMS_CPU)/any/remdeb_f.x\"
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 $(LIB): ${OBJS}
@@ -79,12 +79,9 @@ $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
 $(PROJECT_INCLUDE)/rdbg:
 	@$(mkinstalldirs) $@
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rdbg \
-$(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am
index 006c0d9867..45b775578d 100644
--- a/c/src/librdbg/src/powerpc/Makefile.am
+++ b/c/src/librdbg/src/powerpc/Makefile.am
@@ -6,8 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 SUBDIRS = mcp750
 
-EXTRA_DIST = \
-excep_f.c rdbg_cpu_asm.S rdbg_f.c
+EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/src/powerpc/mcp750/Makefile.am b/c/src/librdbg/src/powerpc/mcp750/Makefile.am
index 7dec77f067..7206431d25 100644
--- a/c/src/librdbg/src/powerpc/mcp750/Makefile.am
+++ b/c/src/librdbg/src/powerpc/mcp750/Makefile.am
@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES += $(H_FILES) $(GEN_C_FILES)
 
 FRONTEND = \"$(RTEMS_CPU)/mcp750/remdeb_f.x\"
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 $(LIB): ${OBJS}
@@ -79,12 +79,9 @@ $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
 $(PROJECT_INCLUDE)/rdbg:
 	@$(mkinstalldirs) $@
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rdbg \
-$(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
index 7dec77f067..7206431d25 100644
--- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES += $(H_FILES) $(GEN_C_FILES)
 
 FRONTEND = \"$(RTEMS_CPU)/mcp750/remdeb_f.x\"
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 $(LIB): ${OBJS}
@@ -79,12 +79,9 @@ $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
 $(PROJECT_INCLUDE)/rdbg:
 	@$(mkinstalldirs) $@
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rdbg \
-$(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)