From e37d7196530443eb40fc9b269b5b19cacc3738ac Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 25 Jul 2003 14:42:01 +0000 Subject: 2003-07-25 Ralf Corsepius * 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. --- c/src/librdbg/src/i386/Makefile.am | 4 ++-- c/src/librdbg/src/i386/any/Makefile.am | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) (limited to 'c/src/librdbg/src/i386') 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 -- cgit v1.2.3