2003-07-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Remove (Merged into ../configure.ac).
	* Makefile.am, include/Makefile.am, include/rdbg/Makefile.am,
	include/rdbg/i386/Makefile.am, include/rdbg/m68k/Makefile.am,
	include/rdbg/powerpc/Makefile.am, src/Makefile.am,
	src/i386/Makefile.am, src/i386/any/Makefile.am,
	src/m68k/Makefile.am, src/m68k/any/Makefile.am,
	src/powerpc/Makefile.am,
	src/powerpc/new_exception_processing/Makefile.am:
	Reflect having merged configure.ac into ../configure.ac.

7 files changed, 61 insertions, 53 deletions

diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am
index 07bce9eb8c..1278eea33d 100644
--- a/c/src/librdbg/src/Makefile.am
+++ b/c/src/librdbg/src/Makefile.am
@@ -3,10 +3,12 @@
 ##
 
 
+if HAS_RDBG
 SUBDIRS = $(RTEMS_CPU)
+endif
 
 EXTRA_DIST = _servtgt.c awk.svc excep.c ptrace.c rdbg.c remdeb.x servbkpt.c \
     servcon.c servrpc.c servtgt.c servtsp.c servutil.c
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/subdirs.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am
index 3f43d58668..a82e459dc3 100644
--- a/c/src/librdbg/src/i386/Makefile.am
+++ b/c/src/librdbg/src/i386/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS = any
 
 EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+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 0d609fe10c..ee255ff6b2 100644
--- a/c/src/librdbg/src/i386/any/Makefile.am
+++ b/c/src/librdbg/src/i386/any/Makefile.am
@@ -5,6 +5,8 @@
 
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
+RPCCPUDIR = $(RTEMS_CPU)/any
+
 LIBNAME = librdbg
 LIB = ${ARCH}/${LIBNAME}.a
 
@@ -32,14 +34,14 @@ OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES)
 MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
 
 #
 # Add local stuff here using +=
 #
 
-FRONTEND = \"$(RTEMS_CPU)/any/remdeb_f.x\"
+FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\"
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
@@ -50,29 +52,29 @@ $(LIB): ${OBJS}
 $(srcdir)/remdeb.h: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
-	  -o i386/any/remdeb.h remdeb.x )
+	  -o $(RPCCPUDIR)/remdeb.h remdeb.x )
 endif
 $(srcdir)/remdeb_xdr.c: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -c -DFRONTEND=$(FRONTEND) \
-	  -o i386/any/remdeb_xdr.c remdeb.x )
+	  -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x )
 endif
 
 $(srcdir)/remdeb_svc.c: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -m -DFRONTEND=$(FRONTEND) \
-	  -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 )
+	  -o $(RPCCPUDIR)/tmpSvc.c remdeb.x; \
+	$(AWK) -f ./awk.svc THEPROG="remdeb.h" $(RPCCPUDIR)/tmpSvc.c \
+	  > $(RPCCPUDIR)/remdeb_svc.c; \
+	sed -e 's/fprintf.*,/printf(/'  $(RPCCPUDIR)/remdeb_svc.c > $(RPCCPUDIR)/remdeb_svc.tmp; \
+	mv $(RPCCPUDIR)/remdeb_svc.tmp $(RPCCPUDIR)/remdeb_svc.c; \
+	rm -f $(RPCCPUDIR)/tmpSvc.c )
 endif
 
 $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
@@ -89,4 +91,4 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = remdeb_f.x $(GEN_C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/librdbg/src/m68k/Makefile.am b/c/src/librdbg/src/m68k/Makefile.am
index 3f43d58668..a82e459dc3 100644
--- a/c/src/librdbg/src/m68k/Makefile.am
+++ b/c/src/librdbg/src/m68k/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS = any
 
 EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/subdirs.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/librdbg/src/m68k/any/Makefile.am b/c/src/librdbg/src/m68k/any/Makefile.am
index 4316d1dc5b..ee255ff6b2 100644
--- a/c/src/librdbg/src/m68k/any/Makefile.am
+++ b/c/src/librdbg/src/m68k/any/Makefile.am
@@ -5,6 +5,8 @@
 
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
+RPCCPUDIR = $(RTEMS_CPU)/any
+
 LIBNAME = librdbg
 LIB = ${ARCH}/${LIBNAME}.a
 
@@ -32,14 +34,14 @@ OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES)
 MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
 
 #
 # Add local stuff here using +=
 #
 
-FRONTEND = \"$(RTEMS_CPU)/any/remdeb_f.x\"
+FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\"
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
@@ -50,29 +52,29 @@ $(LIB): ${OBJS}
 $(srcdir)/remdeb.h: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
-	  -o m68k/any/remdeb.h remdeb.x )
+	  -o $(RPCCPUDIR)/remdeb.h remdeb.x )
 endif
 $(srcdir)/remdeb_xdr.c: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -c -DFRONTEND=$(FRONTEND) \
-	  -o m68k/any/remdeb_xdr.c remdeb.x )
+	  -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x )
 endif
 
 $(srcdir)/remdeb_svc.c: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -m -DFRONTEND=$(FRONTEND) \
-	  -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 )
+	  -o $(RPCCPUDIR)/tmpSvc.c remdeb.x; \
+	$(AWK) -f ./awk.svc THEPROG="remdeb.h" $(RPCCPUDIR)/tmpSvc.c \
+	  > $(RPCCPUDIR)/remdeb_svc.c; \
+	sed -e 's/fprintf.*,/printf(/'  $(RPCCPUDIR)/remdeb_svc.c > $(RPCCPUDIR)/remdeb_svc.tmp; \
+	mv $(RPCCPUDIR)/remdeb_svc.tmp $(RPCCPUDIR)/remdeb_svc.c; \
+	rm -f $(RPCCPUDIR)/tmpSvc.c )
 endif
 
 $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
@@ -89,4 +91,4 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = remdeb_f.x $(GEN_C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am
index e322d3f4c4..b0897a1b0e 100644
--- a/c/src/librdbg/src/powerpc/Makefile.am
+++ b/c/src/librdbg/src/powerpc/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS = new_exception_processing
 
 EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/subdirs.am
+include $(top_srcdir)/../../automake/local.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 6d88639bb4..7b45d7f678 100644
--- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
@@ -5,6 +5,8 @@
 
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
+RPCCPUDIR = $(RTEMS_CPU)/new_exception_processing
+
 LIBNAME = librdbg
 LIB = ${ARCH}/${LIBNAME}.a
 
@@ -32,14 +34,14 @@ OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES)
 MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
 
 #
 # Add local stuff here using +=
 #
 
-FRONTEND = \"$(RTEMS_CPU)/new_exception_processing/remdeb_f.x\"
+FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\"
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
@@ -50,29 +52,29 @@ $(LIB): ${OBJS}
 $(srcdir)/remdeb.h: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
-	  -o powerpc/new_exception_processing/remdeb.h remdeb.x )
+	  -o $(RPCCPUDIR)/remdeb.h remdeb.x )
 endif
 $(srcdir)/remdeb_xdr.c: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -c -DFRONTEND=$(FRONTEND) \
-	  -o powerpc/new_exception_processing/remdeb_xdr.c remdeb.x )
+	  -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x )
 endif
 
 $(srcdir)/remdeb_svc.c: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@ tmpSvc.c
-	( cd $(top_srcdir)/src; \
+	( cd $(top_srcdir)/librdbg/src; \
 	$(RPCGEN) -m -DFRONTEND=$(FRONTEND) \
-	  -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 )
+	  -o $(RPCCPUDIR)/tmpSvc.c remdeb.x; \
+	$(AWK) -f ./awk.svc THEPROG="remdeb.h" $(RPCCPUDIR)/tmpSvc.c \
+	  > $(RPCCPUDIR)/remdeb_svc.c; \
+	sed -e 's/fprintf.*,/printf(/'  $(RPCCPUDIR)/remdeb_svc.c > $(RPCCPUDIR)/remdeb_svc.tmp; \
+	mv $(RPCCPUDIR)/remdeb_svc.tmp $(RPCCPUDIR)/remdeb_svc.c; \
+	rm -f $(RPCCPUDIR)/tmpSvc.c )
 endif
 
 $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
@@ -89,4 +91,4 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = remdeb_f.x $(GEN_C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am