From ecd78c4bf0852ece202cdb2a84ce87c904a01d8e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 9 Dec 2003 12:13:13 +0000 Subject: 2003-12-09 Ralf Corsepius * src/powerpc/new_exception_processing/Makefile.am: Remove. * src/powerpc/Makefile.am: Merge-in former new_exception_processing/Makefile.am. * src/m68k/any/Makefile.am: Remove. * src/m68k/Makefile.am: Merge-in former any/Makefile.am. * src/i386/any/Makefile.am: Remove. * src/i386/Makefile.am: Merge-in former any/Makefile.am. * src/Makefile.am: Cosmetics. * include/Makefile.am: Cosmetics. * Makefile.am: Cosmetics. --- c/src/librdbg/ChangeLog | 13 +++ c/src/librdbg/Makefile.am | 2 - c/src/librdbg/include/Makefile.am | 2 - c/src/librdbg/src/Makefile.am | 2 - c/src/librdbg/src/i386/Makefile.am | 100 +++++++++++++++++++- c/src/librdbg/src/i386/any/Makefile.am | 98 -------------------- c/src/librdbg/src/m68k/Makefile.am | 100 +++++++++++++++++++- c/src/librdbg/src/m68k/any/Makefile.am | 98 -------------------- c/src/librdbg/src/powerpc/Makefile.am | 101 ++++++++++++++++++++- .../powerpc/new_exception_processing/Makefile.am | 98 -------------------- 10 files changed, 305 insertions(+), 309 deletions(-) delete mode 100644 c/src/librdbg/src/i386/any/Makefile.am delete mode 100644 c/src/librdbg/src/m68k/any/Makefile.am delete mode 100644 c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am diff --git a/c/src/librdbg/ChangeLog b/c/src/librdbg/ChangeLog index a8beb07bca..c02a9a0a1f 100644 --- a/c/src/librdbg/ChangeLog +++ b/c/src/librdbg/ChangeLog @@ -1,3 +1,16 @@ +2003-12-09 Ralf Corsepius + + * src/powerpc/new_exception_processing/Makefile.am: Remove. + * src/powerpc/Makefile.am: Merge-in former + new_exception_processing/Makefile.am. + * src/m68k/any/Makefile.am: Remove. + * src/m68k/Makefile.am: Merge-in former any/Makefile.am. + * src/i386/any/Makefile.am: Remove. + * src/i386/Makefile.am: Merge-in former any/Makefile.am. + * src/Makefile.am: Cosmetics. + * include/Makefile.am: Cosmetics. + * Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * src/i386/any/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/librdbg/Makefile.am b/c/src/librdbg/Makefile.am index 0989aebf5e..dca3bb7123 100644 --- a/c/src/librdbg/Makefile.am +++ b/c/src/librdbg/Makefile.am @@ -4,7 +4,5 @@ SUBDIRS = include src -PREINSTALL_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 index 88df4dc2aa..307f21ed34 100644 --- a/c/src/librdbg/include/Makefile.am +++ b/c/src/librdbg/include/Makefile.am @@ -4,7 +4,5 @@ SUBDIRS = rdbg -PREINSTALL_FILES = - include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am index 2a432ebaa0..861019e9f2 100644 --- a/c/src/librdbg/src/Makefile.am +++ b/c/src/librdbg/src/Makefile.am @@ -10,7 +10,5 @@ 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 -PREINSTALL_FILES = - 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 9f7706d4e1..01b5c95d05 100644 --- a/c/src/librdbg/src/i386/Makefile.am +++ b/c/src/librdbg/src/i386/Makefile.am @@ -2,11 +2,105 @@ ## $Id$ ## -SUBDIRS = any - EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c +RPCCPUDIR = $(RTEMS_CPU)/any + +project_lib_DATA = $(ARCH)/librdbg$(LIB_VARIANT).a + +C_FILES = excep_f.c rdbg_f.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) + +up_C_FILES = ../rdbg.c ../servcon.c ../servbkpt.c ../servrpc.c ../excep.c +up_C_FILES += ../servtgt.c ../servtsp.c ../servutil.c ../_servtgt.c \ + ../ptrace.c +C_O_FILES += $(up_C_FILES:../%.c=$(ARCH)/%.$(OBJEXT)) + +${ARCH}/%.o: ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +# Asm source names +S_FILES = rdbg_cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) + +# Generated C source names +GEN_C_FILES = any/remdeb_xdr.c +GEN_C_FILES += any/remdeb_svc.c +C_O_FILES += $(GEN_C_FILES:any/%.c=$(ARCH)/%.$(OBJEXT)) + +${ARCH}/%.o: any/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +# H source names +H_FILES = any/remdeb.h + +# X source names +X_FILES = ../remdeb.x any/remdeb_f.x + +OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES) + +MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES) + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am + +# +# Add local stuff here using += +# + +FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\" + +$(ARCH)/librdbg$(LIB_VARIANT).a: ${OBJS} + $(make-library) + +$(srcdir)/any/remdeb.h: $(X_FILES) +if RPCTOOLS + @rm -f $@ + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \ + -o $(RPCCPUDIR)/remdeb.h remdeb.x ) +endif +$(srcdir)/any/remdeb_xdr.c: $(X_FILES) +if RPCTOOLS + @rm -f $@ + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -c -DFRONTEND=$(FRONTEND) \ + -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x ) +endif + +$(srcdir)/any/remdeb_svc.c: $(X_FILES) +if RPCTOOLS + @rm -f $@ tmpSvc.c + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -m -DFRONTEND=$(FRONTEND) \ + -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 + +include_rdbgdir = $(includedir)/rdbg +include_rdbg_HEADERS = $(srcdir)/any/remdeb.h + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST += remdeb_f.x $(GEN_C_FILES) + PREINSTALL_FILES = -include $(top_srcdir)/automake/subdirs.am +${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a: $(ARCH)/librdbg$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a + +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h + 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 deleted file mode 100644 index 3d1b0b2180..0000000000 --- a/c/src/librdbg/src/i386/any/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/..:@srcdir@/../.. - -RPCCPUDIR = $(RTEMS_CPU)/any - -LIBNAME = librdbg -LIB = ${ARCH}/${LIBNAME}.a - -# C and C++ source names -C_FILES = rdbg.c servcon.c servbkpt.c servrpc.c excep.c excep_f.c servtgt.c \ - servtsp.c servutil.c _servtgt.c rdbg_f.c ptrace.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -# Asm source names -S_FILES = rdbg_cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.$(OBJEXT)) - -# Generated C source names -GEN_C_FILES = remdeb_xdr.c remdeb_svc.c -GEN_C_O_FILES = $(GEN_C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -# H source names -H_FILES = remdeb.h - -# X source names -X_FILES = remdeb.x remdeb_f.x - -OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES) - -MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES) - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# -# Add local stuff here using += -# - -FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\" - -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -$(LIB): ${OBJS} - $(make-library) - -$(srcdir)/remdeb.h: $(X_FILES) -if RPCTOOLS - @rm -f $@ - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \ - -o $(RPCCPUDIR)/remdeb.h remdeb.x ) -endif -$(srcdir)/remdeb_xdr.c: $(X_FILES) -if RPCTOOLS - @rm -f $@ - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -c -DFRONTEND=$(FRONTEND) \ - -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x ) -endif - -$(srcdir)/remdeb_svc.c: $(X_FILES) -if RPCTOOLS - @rm -f $@ tmpSvc.c - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -m -DFRONTEND=$(FRONTEND) \ - -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 - -include_rdbgdir = $(includedir)/rdbg -include_rdbg_HEADERS = $(srcdir)/remdeb.h - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - -EXTRA_DIST = remdeb_f.x $(GEN_C_FILES) - -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/rdbg/$(dirstamp): - @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg - @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - -$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h - -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 9f7706d4e1..01b5c95d05 100644 --- a/c/src/librdbg/src/m68k/Makefile.am +++ b/c/src/librdbg/src/m68k/Makefile.am @@ -2,11 +2,105 @@ ## $Id$ ## -SUBDIRS = any - EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c +RPCCPUDIR = $(RTEMS_CPU)/any + +project_lib_DATA = $(ARCH)/librdbg$(LIB_VARIANT).a + +C_FILES = excep_f.c rdbg_f.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) + +up_C_FILES = ../rdbg.c ../servcon.c ../servbkpt.c ../servrpc.c ../excep.c +up_C_FILES += ../servtgt.c ../servtsp.c ../servutil.c ../_servtgt.c \ + ../ptrace.c +C_O_FILES += $(up_C_FILES:../%.c=$(ARCH)/%.$(OBJEXT)) + +${ARCH}/%.o: ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +# Asm source names +S_FILES = rdbg_cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) + +# Generated C source names +GEN_C_FILES = any/remdeb_xdr.c +GEN_C_FILES += any/remdeb_svc.c +C_O_FILES += $(GEN_C_FILES:any/%.c=$(ARCH)/%.$(OBJEXT)) + +${ARCH}/%.o: any/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +# H source names +H_FILES = any/remdeb.h + +# X source names +X_FILES = ../remdeb.x any/remdeb_f.x + +OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES) + +MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES) + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am + +# +# Add local stuff here using += +# + +FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\" + +$(ARCH)/librdbg$(LIB_VARIANT).a: ${OBJS} + $(make-library) + +$(srcdir)/any/remdeb.h: $(X_FILES) +if RPCTOOLS + @rm -f $@ + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \ + -o $(RPCCPUDIR)/remdeb.h remdeb.x ) +endif +$(srcdir)/any/remdeb_xdr.c: $(X_FILES) +if RPCTOOLS + @rm -f $@ + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -c -DFRONTEND=$(FRONTEND) \ + -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x ) +endif + +$(srcdir)/any/remdeb_svc.c: $(X_FILES) +if RPCTOOLS + @rm -f $@ tmpSvc.c + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -m -DFRONTEND=$(FRONTEND) \ + -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 + +include_rdbgdir = $(includedir)/rdbg +include_rdbg_HEADERS = $(srcdir)/any/remdeb.h + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST += remdeb_f.x $(GEN_C_FILES) + PREINSTALL_FILES = -include $(top_srcdir)/automake/subdirs.am +${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a: $(ARCH)/librdbg$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a + +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h + 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 deleted file mode 100644 index 3d1b0b2180..0000000000 --- a/c/src/librdbg/src/m68k/any/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/..:@srcdir@/../.. - -RPCCPUDIR = $(RTEMS_CPU)/any - -LIBNAME = librdbg -LIB = ${ARCH}/${LIBNAME}.a - -# C and C++ source names -C_FILES = rdbg.c servcon.c servbkpt.c servrpc.c excep.c excep_f.c servtgt.c \ - servtsp.c servutil.c _servtgt.c rdbg_f.c ptrace.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -# Asm source names -S_FILES = rdbg_cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.$(OBJEXT)) - -# Generated C source names -GEN_C_FILES = remdeb_xdr.c remdeb_svc.c -GEN_C_O_FILES = $(GEN_C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -# H source names -H_FILES = remdeb.h - -# X source names -X_FILES = remdeb.x remdeb_f.x - -OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES) - -MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES) - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# -# Add local stuff here using += -# - -FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\" - -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -$(LIB): ${OBJS} - $(make-library) - -$(srcdir)/remdeb.h: $(X_FILES) -if RPCTOOLS - @rm -f $@ - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \ - -o $(RPCCPUDIR)/remdeb.h remdeb.x ) -endif -$(srcdir)/remdeb_xdr.c: $(X_FILES) -if RPCTOOLS - @rm -f $@ - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -c -DFRONTEND=$(FRONTEND) \ - -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x ) -endif - -$(srcdir)/remdeb_svc.c: $(X_FILES) -if RPCTOOLS - @rm -f $@ tmpSvc.c - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -m -DFRONTEND=$(FRONTEND) \ - -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 - -include_rdbgdir = $(includedir)/rdbg -include_rdbg_HEADERS = $(srcdir)/remdeb.h - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - -EXTRA_DIST = remdeb_f.x $(GEN_C_FILES) - -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/rdbg/$(dirstamp): - @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg - @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - -$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h - -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 fbd72f3669..3a80054695 100644 --- a/c/src/librdbg/src/powerpc/Makefile.am +++ b/c/src/librdbg/src/powerpc/Makefile.am @@ -2,11 +2,106 @@ ## $Id$ ## -SUBDIRS = new_exception_processing - EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c +RPCCPUDIR = $(RTEMS_CPU)/new_exception_processing + +project_lib_DATA = $(ARCH)/librdbg$(LIB_VARIANT).a + +C_FILES = excep_f.c rdbg_f.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) + +up_C_FILES = ../rdbg.c ../servcon.c ../servbkpt.c ../servrpc.c ../excep.c +up_C_FILES += ../servtgt.c ../servtsp.c ../servutil.c ../_servtgt.c \ + ../ptrace.c +C_O_FILES += $(up_C_FILES:../%.c=$(ARCH)/%.$(OBJEXT)) + +${ARCH}/%.o: ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +# Asm source names +S_FILES = rdbg_cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) + +# Generated C source names +GEN_C_FILES = new_exception_processing/remdeb_xdr.c +GEN_C_FILES += new_exception_processing/remdeb_svc.c +C_O_FILES += \ + $(GEN_C_FILES:new_exception_processing/%.c=$(ARCH)/%.$(OBJEXT)) + +${ARCH}/%.o: new_exception_processing/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +# H source names +H_FILES = new_exception_processing/remdeb.h + +# X source names +X_FILES = ../remdeb.x new_exception_processing/remdeb_f.x + +OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES) + +MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES) + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am + +# +# Add local stuff here using += +# + +FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\" + +$(ARCH)/librdbg$(LIB_VARIANT).a: ${OBJS} + $(make-library) + +$(srcdir)/new_exception_processing/remdeb.h: $(X_FILES) +if RPCTOOLS + @rm -f $@ + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \ + -o $(RPCCPUDIR)/remdeb.h remdeb.x ) +endif +$(srcdir)/new_exception_processing/remdeb_xdr.c: $(X_FILES) +if RPCTOOLS + @rm -f $@ + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -c -DFRONTEND=$(FRONTEND) \ + -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x ) +endif + +$(srcdir)/new_exception_processing/remdeb_svc.c: $(X_FILES) +if RPCTOOLS + @rm -f $@ tmpSvc.c + ( cd $(top_srcdir)/librdbg/src; \ + $(RPCGEN) -m -DFRONTEND=$(FRONTEND) \ + -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 + +include_rdbgdir = $(includedir)/rdbg +include_rdbg_HEADERS = $(srcdir)/new_exception_processing/remdeb.h + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +EXTRA_DIST += remdeb_f.x $(GEN_C_FILES) + PREINSTALL_FILES = -include $(top_srcdir)/automake/subdirs.am +${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a: $(ARCH)/librdbg$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librdbg$(LIB_VARIANT).a + +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/new_exception_processing/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h + 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 deleted file mode 100644 index 087ed6a805..0000000000 --- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/..:@srcdir@/../.. - -RPCCPUDIR = $(RTEMS_CPU)/new_exception_processing - -LIBNAME = librdbg -LIB = ${ARCH}/${LIBNAME}.a - -# C and C++ source names -C_FILES = rdbg.c servcon.c servbkpt.c servrpc.c excep.c excep_f.c servtgt.c \ - servtsp.c servutil.c _servtgt.c rdbg_f.c ptrace.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -# Asm source names -S_FILES = rdbg_cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.$(OBJEXT)) - -# Generated C source names -GEN_C_FILES = remdeb_xdr.c remdeb_svc.c -GEN_C_O_FILES = $(GEN_C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -# H source names -H_FILES = remdeb.h - -# X source names -X_FILES = remdeb.x remdeb_f.x - -OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES) - -MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES) - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# -# Add local stuff here using += -# - -FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\" - -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -$(LIB): ${OBJS} - $(make-library) - -$(srcdir)/remdeb.h: $(X_FILES) -if RPCTOOLS - @rm -f $@ - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \ - -o $(RPCCPUDIR)/remdeb.h remdeb.x ) -endif -$(srcdir)/remdeb_xdr.c: $(X_FILES) -if RPCTOOLS - @rm -f $@ - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -c -DFRONTEND=$(FRONTEND) \ - -o $(RPCCPUDIR)/remdeb_xdr.c remdeb.x ) -endif - -$(srcdir)/remdeb_svc.c: $(X_FILES) -if RPCTOOLS - @rm -f $@ tmpSvc.c - ( cd $(top_srcdir)/librdbg/src; \ - $(RPCGEN) -m -DFRONTEND=$(FRONTEND) \ - -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 - -include_rdbgdir = $(includedir)/rdbg -include_rdbg_HEADERS = $(srcdir)/remdeb.h - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - -EXTRA_DIST = remdeb_f.x $(GEN_C_FILES) - -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/rdbg/$(dirstamp): - @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg - @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - -$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h - -include $(top_srcdir)/automake/local.am -- cgit v1.2.3