2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* librdbg/Makefile.am: Merge-in librdbg/include/Makefile.am,
	librdbg/src/Makefile.am.
	* librdbg/include/Makefile.am, librdbg/src/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
	Unconditionally apply RTEMS_CHECK_MULTIPROCESSING.
	* wrapup/Makefile.am: Reflect changes above.
	* Makefile.am: Add DIST_SUBDIRS = @BSP_SUBDIRS@.

7 files changed, 277 insertions, 278 deletions

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 108b3dd9bf..0bb316a314 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* librdbg/Makefile.am: Merge-in librdbg/include/Makefile.am,
+	librdbg/src/Makefile.am.
+	* librdbg/include/Makefile.am, librdbg/src/Makefile.am: Remove.
+	* configure.ac: Reflect changes above. 
+	Unconditionally apply RTEMS_CHECK_MULTIPROCESSING.
+	* wrapup/Makefile.am: Reflect changes above.
+	* Makefile.am: Add DIST_SUBDIRS = @BSP_SUBDIRS@.
+
 2004-02-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* aclocal/check-rdbg.m4: Don't AC_SUBST(HAS_RDBG).
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index 0fa0e9fd9b..6c402dcb45 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -5,6 +5,7 @@
 ACLOCAL_AMFLAGS = -I aclocal
 
 SUBDIRS = . @BSP_SUBDIRS@
+DIST_SUBDIRS = @BSP_SUBDIRS@
 
 clean-local:
 	$(RM) -r $(PROJECT_RELEASE)
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 4fe403a43a..5ec98e6db3 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -115,9 +115,10 @@ RTEMS_CANONICALIZE_TOOLS
 AC_SUBST(CUSTOM_CFG_FILES)
 AC_SUBST(cfg_dir)
 
+RTEMS_CHECK_MULTIPROCESSING
+
 ## Configure ${srcdir}/../../cpukit as cpukit/ if multilibs are disabled
 AS_IF([test x"$multilib" = x"no"],[
-  RTEMS_CHECK_MULTIPROCESSING
   AC_CONFIG_COMMANDS_POST([
     if test x"$multilib" = x"no"; then
     RTEMS_CONFIG_SUBDIR([cpukit],[../../cpukit],
@@ -249,8 +250,6 @@ libnetworking/rtems_telnetd/Makefile
 libnetworking/rtems_webserver/Makefile
 
 librdbg/Makefile
-librdbg/include/Makefile
-librdbg/src/Makefile
 
 libchip/Makefile
 
diff --git a/c/src/librdbg/Makefile.am b/c/src/librdbg/Makefile.am
index dca3bb7123..e1d41d7bfe 100644
--- a/c/src/librdbg/Makefile.am
+++ b/c/src/librdbg/Makefile.am
@@ -2,7 +2,268 @@
 ## $Id$
 ##
 
-SUBDIRS = include src
+include $(top_srcdir)/automake/compile.am
+
+CLEANFILES =
+BUILT_SOURCES =
+MAINTAINERCLEANFILES =
+
+## FIXME: This Makefile.am is one blatant ugly HACK
+## May-be this should be put into libcpu?
+
+if HAS_RDBG
+include_rdbgdir = $(includedir)/rdbg
+
+include_rdbg_HEADERS = include/rdbg/rdbg.h include/rdbg/servrpc.h
+
+EXTRA_LIBRARIES = librdbg.a
+CLEANFILES += librdbg.a
+librdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+
+EXTRA_LIBRARIES += librdbg_g.a
+CLEANFILES += librdbg_g.a
+librdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+librdbg_g_a_SOURCES = $(librdbg_a_SOURCES)
+
+project_lib_DATA = librdbg$(LIB_VARIANT).a
+
+librdbg_a_SOURCES = src/rdbg.c src/servcon.c src/servbkpt.c src/servrpc.c \
+    src/excep.c src/servtgt.c src/servtsp.c src/servutil.c src/_servtgt.c \
+    src/ptrace.c
+endif
+
+X_FILES = src/remdeb.x
+EXTRA_DIST = src/remdeb.x
+
+if HAS_RDBG
+if HAS_RDBG_powerpc
+librdbg_a_SOURCES += src/powerpc/excep_f.c src/powerpc/rdbg_f.c \
+    src/powerpc/rdbg_cpu_asm.S
+
+# Generated sources
+librdbg_a_SOURCES += src/powerpc/new_exception_processing/remdeb_xdr.c
+librdbg_a_SOURCES += src/powerpc/new_exception_processing/remdeb_svc.c
+librdbg_a_SOURCES += src/powerpc/new_exception_processing/remdeb.h
+include_rdbg_HEADERS += src/powerpc/new_exception_processing/remdeb.h
+include_rdbg_HEADERS += include/rdbg/powerpc/rdbg_f.h \
+    include/rdbg/powerpc/reg.h
+endif
+endif
+
+# X source names
+EXTRA_DIST += src/powerpc/new_exception_processing/remdeb_f.x
+
+BUILT_SOURCES += src/powerpc/new_exception_processing/remdeb.h
+BUILT_SOURCES += src/powerpc/new_exception_processing/remdeb_xdr.c
+BUILT_SOURCES += src/powerpc/new_exception_processing/remdeb_svc.c
+MAINTAINERCLEANFILES += src/powerpc/new_exception_processing/remdeb_xdr.c
+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) \
+    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 )
+
+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 )
+
+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 \
+	  > 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; \
+	rm -f src/powerpc/new_exception_processing/tmpSvc.c )
+endif
+
+if HAS_RDBG
+if HAS_RDBG_i386
+librdbg_a_SOURCES += src/i386/excep_f.c src/i386/rdbg_f.c \
+    src/i386/rdbg_cpu_asm.S
+
+# Generated sources
+librdbg_a_SOURCES += src/i386/any/remdeb_xdr.c
+librdbg_a_SOURCES += src/i386/any/remdeb_svc.c
+librdbg_a_SOURCES += src/i386/any/remdeb.h
+include_rdbg_HEADERS += src/i386/any/remdeb.h
+include_rdbg_HEADERS += include/rdbg/i386/rdbg_f.h include/rdbg/i386/reg.h
+endif
+endif
+
+# X source names
+EXTRA_DIST += src/i386/any/remdeb_f.x
+BUILT_SOURCES += src/i386/any/remdeb.h
+BUILT_SOURCES += src/i386/any/remdeb_xdr.c
+BUILT_SOURCES += src/i386/any/remdeb_svc.c
+MAINTAINERCLEANFILES += src/i386/any/remdeb_xdr.c
+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 \
+	  > 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; \
+	rm -f src/i386/any/tmpSvc.c )
+endif
+
+if HAS_RDBG
+if HAS_RDBG_m68k
+librdbg_a_SOURCES += src/m68k/excep_f.c src/m68k/rdbg_f.c \
+    src/m68k/rdbg_cpu_asm.S
+
+# Generated sources
+librdbg_a_SOURCES += src/m68k/any/remdeb_xdr.c
+librdbg_a_SOURCES += src/m68k/any/remdeb_svc.c
+librdbg_a_SOURCES += src/m68k/any/remdeb.h
+include_rdbg_HEADERS += src/m68k/any/remdeb.h
+include_rdbg_HEADERS += include/rdbg/m68k/rdbg_f.h include/rdbg/m68k/reg.h
+endif
+endif
+
+# X source names
+EXTRA_DIST += src/m68k/any/remdeb_f.x
+BUILT_SOURCES += src/m68k/any/remdeb.h
+BUILT_SOURCES += src/m68k/any/remdeb_xdr.c
+BUILT_SOURCES += src/m68k/any/remdeb_svc.c
+MAINTAINERCLEANFILES += src/m68k/any/remdeb_xdr.c
+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 \
+	  > 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; \
+	rm -f src/m68k/any/tmpSvc.c )
+endif
+
+EXTRA_DIST += src/awk.svc
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+PREINSTALL_DIRS =
+PREINSTALL_FILES =
+TMPINSTALL_FILES =
+
+$(PROJECT_LIB)/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_LIB)
+	@: > $(PROJECT_LIB)/$(dirstamp)
+TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
+
+if HAS_RDBG
+$(PROJECT_INCLUDE)/rdbg/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/rdbg
+	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rdbg/rdbg.h: include/rdbg/rdbg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg.h
+
+$(PROJECT_INCLUDE)/rdbg/servrpc.h: include/rdbg/servrpc.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/servrpc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/servrpc.h
+
+$(PROJECT_LIB)/librdbg$(LIB_VARIANT).a: librdbg$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
+TMPINSTALL_FILES += $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
+endif
+
+if HAS_RDBG
+if HAS_RDBG_powerpc
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: src/powerpc/new_exception_processing/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
+
+$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: include/rdbg/powerpc/rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
+
+$(PROJECT_INCLUDE)/rdbg/reg.h: include/rdbg/powerpc/reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h
+endif
+endif
+
+if HAS_RDBG
+if HAS_RDBG_i386
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: src/i386/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
+
+$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: include/rdbg/i386/rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
+
+$(PROJECT_INCLUDE)/rdbg/reg.h: include/rdbg/i386/reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h
+endif
+endif
+
+if HAS_RDBG
+if HAS_RDBG_m68k
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: src/m68k/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
+
+$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: include/rdbg/m68k/rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
+
+$(PROJECT_INCLUDE)/rdbg/reg.h: include/rdbg/m68k/reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h
+endif
+endif
+
+CLEANFILES += $(PREINSTALL_FILES)
+DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES += $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/include/Makefile.am b/c/src/librdbg/include/Makefile.am
deleted file mode 100644
index 4e8c684479..0000000000
--- a/c/src/librdbg/include/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##
-## $Id$
-##
-
-## FIXME: This all is one blatant ugly HACK
-## May-be this should be put into libcpu?
-
-if HAS_RDBG
-include_rdbgdir = $(includedir)/rdbg
-
-include_rdbg_HEADERS = rdbg/rdbg.h rdbg/servrpc.h
-nodist_include_rdbg_HEADERS = rdbg/@RTEMS_CPU@/rdbg_f.h \
-    rdbg/@RTEMS_CPU@/reg.h
-
-EXTRA_DIST = rdbg/i386/rdbg_f.h rdbg/i386/reg.h
-EXTRA_DIST += rdbg/m68k/rdbg_f.h rdbg/m68k/reg.h
-EXTRA_DIST += rdbg/powerpc/rdbg_f.h rdbg/powerpc/reg.h
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-if HAS_RDBG
-$(PROJECT_INCLUDE)/rdbg/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/rdbg
-	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rdbg/rdbg.h: rdbg/rdbg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg.h
-
-$(PROJECT_INCLUDE)/rdbg/servrpc.h: rdbg/servrpc.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/servrpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/servrpc.h
-
-$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: rdbg/@RTEMS_CPU@/rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h
-
-$(PROJECT_INCLUDE)/rdbg/reg.h: rdbg/@RTEMS_CPU@/reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h
-endif
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am
deleted file mode 100644
index 98c82d70f2..0000000000
--- a/c/src/librdbg/src/Makefile.am
+++ /dev/null
@@ -1,221 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/automake/compile.am
-
-CLEANFILES =
-BUILT_SOURCES =
-
-if HAS_RDBG
-include_rdbgdir = $(includedir)/rdbg
-
-EXTRA_LIBRARIES = librdbg.a
-CLEANFILES += librdbg.a
-librdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += librdbg_g.a
-CLEANFILES += librdbg_g.a
-librdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-librdbg_g_a_SOURCES = $(librdbg_a_SOURCES)
-
-project_lib_DATA = librdbg$(LIB_VARIANT).a
-
-librdbg_a_SOURCES = rdbg.c servcon.c servbkpt.c servrpc.c excep.c servtgt.c \
-    servtsp.c servutil.c _servtgt.c ptrace.c
-endif
-
-X_FILES = remdeb.x
-EXTRA_DIST = remdeb.x
-
-if HAS_RDBG
-if HAS_RDBG_powerpc
-librdbg_a_SOURCES += powerpc/excep_f.c powerpc/rdbg_f.c \
-    powerpc/rdbg_cpu_asm.S
-
-# Generated sources
-librdbg_a_SOURCES += powerpc/new_exception_processing/remdeb_xdr.c
-librdbg_a_SOURCES += powerpc/new_exception_processing/remdeb_svc.c
-librdbg_a_SOURCES += powerpc/new_exception_processing/remdeb.h
-MAINTAINERCLEANFILES = powerpc/new_exception_processing/remdeb_xdr.c
-MAINTAINERCLEANFILES += powerpc/new_exception_processing/remdeb_svc.c
-MAINTAINERCLEANFILES += powerpc/new_exception_processing/remdeb.h
-
-include_rdbg_HEADERS = powerpc/new_exception_processing/remdeb.h
-endif
-endif
-
-# X source names
-EXTRA_DIST += powerpc/new_exception_processing/remdeb_f.x
-BUILT_SOURCES += powerpc/new_exception_processing/remdeb.h \
-powerpc/new_exception_processing/remdeb_xdr.c \
-powerpc/new_exception_processing/remdeb_svc.c
-
-if RPCTOOLS
-powerpc/new_exception_processing/remdeb.h: $(X_FILES) \
-    powerpc/new_exception_processing/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -h -DFRONTEND=\"powerpc/new_exception_processing/remdeb_f.x\" \
-	  -o powerpc/new_exception_processing/remdeb.h remdeb.x )
-
-powerpc/new_exception_processing/remdeb_xdr.c: $(X_FILES) \
-   powerpc/new_exception_processing/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -c -DFRONTEND=\"powerpc/new_exception_processing/remdeb_f.x\" \
-	  -o powerpc/new_exception_processing/remdeb_xdr.c remdeb.x )
-
-powerpc/new_exception_processing/remdeb_svc.c: $(X_FILES) \
-   powerpc/new_exception_processing/remdeb_f.x
-	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -m -DFRONTEND=\"powerpc/new_exception_processing/remdeb_f.x\" \
-	  -o powerpc/new_exception_processing/tmpSvc.c remdeb.x; \
-	$(AWK) -f ./awk.svc THEPROG="remdeb.h" powerpc/new_exception_processing/tmpSvc.c \
-	  > powerpc/new_exception_processing/remdeb_svc.c; \
-	sed -e 's/fprintf.*,/printf(/'  powerpc/new_exception_processing/remdeb_svc.c > powerpc/new_exception_processing/remdeb_svc.tmp; \
-	mv powerpc/new_exception_processing/remdeb_svc.tmp powerpc/new_exception_processing/remdeb_svc.c; \
-	rm -f powerpc/new_exception_processing/tmpSvc.c )
-endif
-
-if HAS_RDBG
-if HAS_RDBG_i386
-librdbg_a_SOURCES += i386/excep_f.c i386/rdbg_f.c i386/rdbg_cpu_asm.S
-
-# Generated sources
-librdbg_a_SOURCES += i386/any/remdeb_xdr.c
-librdbg_a_SOURCES += i386/any/remdeb_svc.c
-librdbg_a_SOURCES += i386/any/remdeb.h
-MAINTAINERCLEANFILES = i386/any/remdeb_xdr.c
-MAINTAINERCLEANFILES += i386/any/remdeb_svc.c
-MAINTAINERCLEANFILES += i386/any/remdeb.h
-
-include_rdbg_HEADERS = i386/any/remdeb.h
-endif
-endif
-
-# X source names
-EXTRA_DIST += i386/any/remdeb_f.x
-BUILT_SOURCES += i386/any/remdeb.h i386/any/remdeb_xdr.c i386/any/remdeb_svc.c
-
-if RPCTOOLS
-i386/any/remdeb.h: $(X_FILES) i386/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -h -DFRONTEND=\"i386/any/remdeb_f.x\" \
-	  -o i386/any/remdeb.h remdeb.x )
-
-i386/any/remdeb_xdr.c: $(X_FILES) i386/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -c -DFRONTEND=\"i386/any/remdeb_f.x\" \
-	  -o i386/any/remdeb_xdr.c remdeb.x )
-
-i386/any/remdeb_svc.c: $(X_FILES) i386/any/remdeb_f.x
-	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -m -DFRONTEND=\"i386/any/remdeb_f.x\" \
-	  -o i386/any/tmpSvc.c remdeb.x; \
-	$(AWK) -f ./awk.svc THEPROG="remdeb.h" i386/any/tmpSvc.c \
-	  > i386/any/remdeb_svc.c; \
-	sed -e 's/fprintf.*,/printf(/'  i386/any/remdeb_svc.c > i386/any/remdeb_svc.tmp; \
-	mv i386/any/remdeb_svc.tmp i386/any/remdeb_svc.c; \
-	rm -f i386/any/tmpSvc.c )
-endif
-
-if HAS_RDBG
-if HAS_RDBG_m68k
-librdbg_a_SOURCES += m68k/excep_f.c m68k/rdbg_f.c m68k/rdbg_cpu_asm.S
-
-# Generated sources
-librdbg_a_SOURCES += m68k/any/remdeb_xdr.c
-librdbg_a_SOURCES += m68k/any/remdeb_svc.c
-librdbg_a_SOURCES += m68k/any/remdeb.h
-MAINTAINERCLEANFILES = m68k/any/remdeb_xdr.c
-MAINTAINERCLEANFILES += m68k/any/remdeb_svc.c
-MAINTAINERCLEANFILES += m68k/any/remdeb.h
-
-include_rdbg_HEADERS = m68k/any/remdeb.h
-endif
-endif
-
-# X source names
-EXTRA_DIST += m68k/any/remdeb_f.x
-BUILT_SOURCES += m68k/any/remdeb.h m68k/any/remdeb_xdr.c m68k/any/remdeb_svc.c
-if RPCTOOLS
-m68k/any/remdeb.h: $(X_FILES) m68k/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -h -DFRONTEND=\"m68k/any/remdeb_f.x\" \
-	  -o m68k/any/remdeb.h remdeb.x )
-m68k/any/remdeb_xdr.c: $(X_FILES) m68k/any/remdeb_f.x
-	@rm -f $@
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -c -DFRONTEND=\"m68k/any/remdeb_f.x\" \
-	  -o m68k/any/remdeb_xdr.c remdeb.x )
-m68k/any/remdeb_svc.c: $(X_FILES) m68k/any/remdeb_f.x
-	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/librdbg/src; \
-	$(RPCGEN) -m -DFRONTEND=\"m68k/any/remdeb_f.x\" \
-	  -o m68k/any/tmpSvc.c remdeb.x; \
-	$(AWK) -f ./awk.svc THEPROG="remdeb.h" m68k/any/tmpSvc.c \
-	  > m68k/any/remdeb_svc.c; \
-	sed -e 's/fprintf.*,/printf(/'  m68k/any/remdeb_svc.c > m68k/any/remdeb_svc.tmp; \
-	mv m68k/any/remdeb_svc.tmp m68k/any/remdeb_svc.c; \
-	rm -f m68k/any/tmpSvc.c )
-endif
-
-EXTRA_DIST += awk.svc
-
-all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
-if HAS_RDBG
-$(PROJECT_INCLUDE)/rdbg/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/rdbg
-	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-
-$(PROJECT_LIB)/librdbg$(LIB_VARIANT).a: librdbg$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
-endif
-
-if HAS_RDBG
-if HAS_RDBG_powerpc
-$(PROJECT_INCLUDE)/rdbg/remdeb.h: powerpc/new_exception_processing/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
-endif
-endif
-
-if HAS_RDBG
-if HAS_RDBG_i386
-$(PROJECT_INCLUDE)/rdbg/remdeb.h: i386/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
-endif
-endif
-
-if HAS_RDBG
-if HAS_RDBG_m68k
-$(PROJECT_INCLUDE)/rdbg/remdeb.h: m68k/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
-endif
-endif
-
-CLEANFILES += $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-CLEANFILES += $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/automake/local.am
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 40e834f4b6..0cbf6c9ba3 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -39,7 +39,7 @@ SRCS += ../libnetworking/rtems_telnetd/libtelnetd$(LIB_VARIANT).a
 endif
 
 if HAS_RDBG
-SRCS += ../librdbg/src/librdbg$(LIB_VARIANT).a
+SRCS += ../librdbg/librdbg$(LIB_VARIANT).a
 endif
 
 # FIXME: ATM, there is no libcpu.a, anymore.