From 4090ebe85c7947db664c0839a2090d0076b7a9da Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 3 Dec 1999 13:25:00 +0000
Subject: Patch rtems-rc-19991123-rc-3.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de>:

    The patch below provides
      * automake support for score/cpu/powerpc
      * The hack to propagate values from *.cfg to automake configuration
      * A fix for librdbg/powerpc/mcp750/Makefile.am (Was completely corrupted
        before)
      * Fixes some files which apparently where missing in
        rtems-rc-19991123-rc-2.diff
      * some minor configuration related patches

    To apply:

      rm -rf ./c/src/exec/score/cpu/powerpc/wrap
      patch -p1 < rtems-rc-19991123-rc-3.diff

    Attention:
      c/src/exec/score/cpu/[configure.in|aclocal.m4|configure] should be
      removed after applying the patch.

Modifications had been made to the score/cpu/powerpc directory after
the snapshot this was based on.  In particular, the mpc750 and
other_cpu directories had been renamed to new_exception_processing
and old_exception_processing.  After this patch was applied, modifications
were made to account for this.
---
 .../powerpc/new_exception_processing/Makefile.am   | 44 ++++++++++------------
 1 file changed, 20 insertions(+), 24 deletions(-)

(limited to 'c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am')

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 a619510005..3e846b54f9 100644
--- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
@@ -46,29 +46,22 @@ RPCGEN = @RPCGEN@
 AWK = @AWK@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
+include $(top_srcdir)/../../../automake/lib.am
 
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rdbg \
+$(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-INSTALLDIRS = $(PROJECT_INCLUDE)/rdbg
+$(PROJECT_INCLUDE)/rdbg:
+	@$(mkinstalldirs) $@
 
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
+TMPINSTALL_FILES += \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
 
 #
 # Add local stuff here using +=
 #
 
-DEFINES +=
-CPPFLAGS +=
-#
-# Enable traces in RDBG
-#
-#CFLAGS   += -DDDEBUG
-#
-CFLAGS +=
-
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -76,15 +69,16 @@ CFLAGS +=
 #  'make clobber' already includes 'make clean'
 #
 
-CLEAN_ADDITIONS += $(LIB) $(H_FILES) $(GEN_C_FILES)
-CLOBBER_ADDITIONS +=
+CLEANFILES += $(LIB) $(H_FILES) $(GEN_C_FILES)
 
 FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
 
-all: ${ARCH} $(LIB)
-	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
 
-$(LIB): $(SRCS) ${OBJS}
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+$(LIB): ${OBJS}
 	$(make-library)
 
 remdeb.h: $(X_FILES)
@@ -92,7 +86,9 @@ remdeb.h: $(X_FILES)
 	( pwd=`pwd`; cd $(srcdir)/../..; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
 	  -o $$pwd/$@ remdeb.x )
-	@$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: remdeb.h
+	$(INSTALL_DATA) $< $@
 
 remdeb_xdr.c: $(X_FILES)
 	@rm -f $@
@@ -108,6 +104,6 @@ remdeb_svc.c: $(X_FILES)
 	$(AWK) -f $(srcdir)/../../awk.svc THEPROG="remdeb.h" tmpSvc.c >$@
 	@rm -f tmpSvc.c
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+EXTRA_DIST = remdeb_f.x
+
+include $(top_srcdir)/../../../automake/local.am
-- 
cgit v1.2.3