2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>

	* librdbg/Makefile.am: Fix rpcgen rules.
	* librdbg/src/i386/any/remdeb_xdr.c,
	librdbg/src/m68k/any/remdeb_xdr.c,
	librdbg/src/powerpc/new_exception_processing/remdeb_xdr.c:
	Reflect changes to librdbg/Makefile.am.

5 files changed, 55 insertions, 53 deletions

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 513699f37a..c4489641d6 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-30	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* librdbg/Makefile.am: Fix rpcgen rules.
+	* librdbg/src/i386/any/remdeb_xdr.c,
+	librdbg/src/m68k/any/remdeb_xdr.c,
+	librdbg/src/powerpc/new_exception_processing/remdeb_xdr.c:
+	Reflect changes to librdbg/Makefile.am.
+
 2004-03-29	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* configure.ac: Reflect changes testsuites/configure.ac and
diff --git a/c/src/librdbg/Makefile.am b/c/src/librdbg/Makefile.am
index e1d41d7bfe..7e181ed8b5 100644
--- a/c/src/librdbg/Makefile.am
+++ b/c/src/librdbg/Makefile.am
@@ -61,27 +61,25 @@ MAINTAINERCLEANFILES += src/powerpc/new_exception_processing/remdeb_svc.c
 MAINTAINERCLEANFILES += src/powerpc/new_exception_processing/remdeb.h
 
 if RPCTOOLS
-src/powerpc/new_exception_processing/remdeb.h: $(X_FILES) \
+$(srcdir)/src/powerpc/new_exception_processing/remdeb.h: $(X_FILES) \
     src/powerpc/new_exception_processing/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -h -DFRONTEND=\"src/powerpc/new_exception_processing/remdeb_f.x\" \
-	  -o src/powerpc/new_exception_processing/remdeb.h remdeb.x )
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -h -DFRONTEND=\"powerpc/new_exception_processing/remdeb_f.x\" \
+	  -o src/powerpc/new_exception_processing/remdeb.h src/remdeb.x )
 
-src/powerpc/new_exception_processing/remdeb_xdr.c: $(X_FILES) \
+$(srcdir)/src/powerpc/new_exception_processing/remdeb_xdr.c: $(X_FILES) \
    src/powerpc/new_exception_processing/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -c -DFRONTEND=\"src/powerpc/new_exception_processing/remdeb_f.x\" \
-	  -o src/powerpc/new_exception_processing/remdeb_xdr.c remdeb.x )
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -c -DFRONTEND=\"powerpc/new_exception_processing/remdeb_f.x\" src/remdeb.x \
+	 | sed "s,^#include.*remdeb\.h.*,#include \"src/powerpc/new_exception_processing/remdeb.h\"," \
+	 > src/powerpc/new_exception_processing/remdeb_xdr.c )
 
-src/powerpc/new_exception_processing/remdeb_svc.c: $(X_FILES) \
+$(srcdir)/src/powerpc/new_exception_processing/remdeb_svc.c: $(X_FILES) \
    src/powerpc/new_exception_processing/remdeb_f.x
-	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -m -DFRONTEND=\"src/powerpc/new_exception_processing/remdeb_f.x\" \
-	  -o src/powerpc/new_exception_processing/tmpSvc.c remdeb.x; \
-	$(AWK) -f ./awk.svc THEPROG="remdeb.h" src/powerpc/new_exception_processing/tmpSvc.c \
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -m -DFRONTEND=\"powerpc/new_exception_processing/remdeb_f.x\" \
+	  -o src/powerpc/new_exception_processing/tmpSvc.c src/remdeb.x; \
+	$(AWK) -f src/awk.svc THEPROG="remdeb.h" src/powerpc/new_exception_processing/tmpSvc.c \
 	  > src/powerpc/new_exception_processing/remdeb_svc.c; \
 	sed -e 's/fprintf.*,/printf(/'  src/powerpc/new_exception_processing/remdeb_svc.c > src/powerpc/new_exception_processing/remdeb_svc.tmp; \
 	mv src/powerpc/new_exception_processing/remdeb_svc.tmp src/powerpc/new_exception_processing/remdeb_svc.c; \
@@ -112,24 +110,22 @@ MAINTAINERCLEANFILES += src/i386/any/remdeb_svc.c
 MAINTAINERCLEANFILES += src/i386/any/remdeb.h
 
 if RPCTOOLS
-src/i386/any/remdeb.h: $(X_FILES) src/i386/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -h -DFRONTEND=\"src/i386/any/remdeb_f.x\" \
-	  -o src/i386/any/remdeb.h remdeb.x )
-
-src/i386/any/remdeb_xdr.c: $(X_FILES) src/i386/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -c -DFRONTEND=\"src/i386/any/remdeb_f.x\" \
-	  -o src/i386/any/remdeb_xdr.c remdeb.x )
-
-src/i386/any/remdeb_svc.c: $(X_FILES) src/i386/any/remdeb_f.x
-	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -m -DFRONTEND=\"src/i386/any/remdeb_f.x\" \
-	  -o src/i386/any/tmpSvc.c remdeb.x; \
-	$(AWK) -f ./awk.svc THEPROG="remdeb.h" src/i386/any/tmpSvc.c \
+$(srcdir)/src/i386/any/remdeb.h: $(X_FILES) src/i386/any/remdeb_f.x
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -h -DFRONTEND=\"i386/any/remdeb_f.x\" \
+	  -o src/i386/any/remdeb.h src/remdeb.x )
+
+$(srcdir)/src/i386/any/remdeb_xdr.c: $(X_FILES) src/i386/any/remdeb_f.x
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -c -DFRONTEND=\"i386/any/remdeb_f.x\" src/remdeb.x \
+	 | sed "s,^#include.*remdeb\.h.*,#include \"src/i386/any/remdeb.h\"," \
+	 > src/i386/any/remdeb_xdr.c )
+
+$(srcdir)/src/i386/any/remdeb_svc.c: $(X_FILES) src/i386/any/remdeb_f.x
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -m -DFRONTEND=\"i386/any/remdeb_f.x\" \
+	  -o src/i386/any/tmpSvc.c src/remdeb.x; \
+	$(AWK) -f src/awk.svc THEPROG="remdeb.h" src/i386/any/tmpSvc.c \
 	  > src/i386/any/remdeb_svc.c; \
 	sed -e 's/fprintf.*,/printf(/'  src/i386/any/remdeb_svc.c > src/i386/any/remdeb_svc.tmp; \
 	mv src/i386/any/remdeb_svc.tmp src/i386/any/remdeb_svc.c; \
@@ -160,22 +156,20 @@ MAINTAINERCLEANFILES += src/m68k/any/remdeb_svc.c
 MAINTAINERCLEANFILES += src/m68k/any/remdeb.h
 
 if RPCTOOLS
-src/m68k/any/remdeb.h: $(X_FILES) src/m68k/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -h -DFRONTEND=\"src/m68k/any/remdeb_f.x\" \
-	  -o src/m68k/any/remdeb.h remdeb.x )
-src/m68k/any/remdeb_xdr.c: $(X_FILES) src/m68k/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -c -DFRONTEND=\"src/m68k/any/remdeb_f.x\" \
-	  -o src/m68k/any/remdeb_xdr.c remdeb.x )
-src/m68k/any/remdeb_svc.c: $(X_FILES) src/m68k/any/remdeb_f.x
-	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -m -DFRONTEND=\"src/m68k/any/remdeb_f.x\" \
-	  -o src/m68k/any/tmpSvc.c remdeb.x; \
-	$(AWK) -f ./awk.svc THEPROG="remdeb.h" src/m68k/any/tmpSvc.c \
+$(srcdir)/src/m68k/any/remdeb.h: $(X_FILES) src/m68k/any/remdeb_f.x
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -h -DFRONTEND=\"m68k/any/remdeb_f.x\" \
+	  -o src/m68k/any/remdeb.h src/remdeb.x )
+$(srcdir)/src/m68k/any/remdeb_xdr.c: $(X_FILES) src/m68k/any/remdeb_f.x
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -c -DFRONTEND=\"m68k/any/remdeb_f.x\" src/remdeb.x \
+	 | sed "s,^#include.*remdeb\.h.*,#include \"src/m68k/any/remdeb.h\"," \
+	 > src/m68k/any/remdeb_xdr.c )
+$(srcdir)/src/m68k/any/remdeb_svc.c: $(X_FILES) src/m68k/any/remdeb_f.x
+	rm -f $@; ( cd $(srcdir) && \
+	$(RPCGEN) -m -DFRONTEND=\"m68k/any/remdeb_f.x\" \
+	  -o src/m68k/any/tmpSvc.c src/remdeb.x; \
+	$(AWK) -f src/awk.svc THEPROG="remdeb.h" src/m68k/any/tmpSvc.c \
 	  > src/m68k/any/remdeb_svc.c; \
 	sed -e 's/fprintf.*,/printf(/'  src/m68k/any/remdeb_svc.c > src/m68k/any/remdeb_svc.tmp; \
 	mv src/m68k/any/remdeb_svc.tmp src/m68k/any/remdeb_svc.c; \
diff --git a/c/src/librdbg/src/i386/any/remdeb_xdr.c b/c/src/librdbg/src/i386/any/remdeb_xdr.c
index 49d8f41d11..f266b6b5b5 100644
--- a/c/src/librdbg/src/i386/any/remdeb_xdr.c
+++ b/c/src/librdbg/src/i386/any/remdeb_xdr.c
@@ -3,7 +3,7 @@
  * It was generated using rpcgen.
  */
 
-#include "remdeb.h"
+#include "src/i386/any/remdeb.h"
 #define RTEMS_PORT 2071
 #define RTEMS_BACK_PORT 2073
 
diff --git a/c/src/librdbg/src/m68k/any/remdeb_xdr.c b/c/src/librdbg/src/m68k/any/remdeb_xdr.c
index df1bb48a67..a74d02f68f 100644
--- a/c/src/librdbg/src/m68k/any/remdeb_xdr.c
+++ b/c/src/librdbg/src/m68k/any/remdeb_xdr.c
@@ -3,7 +3,7 @@
  * It was generated using rpcgen.
  */
 
-#include "remdeb.h"
+#include "src/m68k/any/remdeb.h"
 #define RTEMS_PORT 2071
 #define RTEMS_BACK_PORT 2073
 
diff --git a/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_xdr.c b/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_xdr.c
index 88c1a30c14..4d4258f95a 100644
--- a/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_xdr.c
+++ b/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_xdr.c
@@ -3,7 +3,7 @@
  * It was generated using rpcgen.
  */
 
-#include "remdeb.h"
+#include "src/powerpc/new_exception_processing/remdeb.h"
 #define RTEMS_PORT 2071
 #define RTEMS_BACK_PORT 2073