From b0837363631003090e8b9c8ccb61a10055d866f5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 13 Feb 2004 13:15:15 +0000 Subject: 2004-02-13 Ralf Corsepius * librdbg/include/Makefile.am: Merge-in librdbg/include/rdbg/i386/Makefile.am, librdbg/include/rdbg/m68k/Makefile.am, librdbg/include/rdbg/Makefile.am, librdbg/include/rdbg/powerpc/Makefile.am. * librdbg/include/rdbg/i386/Makefile.am, librdbg/include/rdbg/m68k/Makefile.am, librdbg/include/rdbg/Makefile.am, librdbg/include/rdbg/powerpc/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/ChangeLog | 11 ++++++ c/src/configure.ac | 4 --- c/src/librdbg/include/Makefile.am | 47 ++++++++++++++++++++++++-- c/src/librdbg/include/rdbg/.cvsignore | 2 -- c/src/librdbg/include/rdbg/Makefile.am | 40 ---------------------- c/src/librdbg/include/rdbg/i386/.cvsignore | 2 -- c/src/librdbg/include/rdbg/i386/Makefile.am | 30 ---------------- c/src/librdbg/include/rdbg/m68k/.cvsignore | 2 -- c/src/librdbg/include/rdbg/m68k/Makefile.am | 30 ---------------- c/src/librdbg/include/rdbg/powerpc/.cvsignore | 2 -- c/src/librdbg/include/rdbg/powerpc/Makefile.am | 30 ---------------- 11 files changed, 56 insertions(+), 144 deletions(-) delete mode 100644 c/src/librdbg/include/rdbg/.cvsignore delete mode 100644 c/src/librdbg/include/rdbg/Makefile.am delete mode 100644 c/src/librdbg/include/rdbg/i386/.cvsignore delete mode 100644 c/src/librdbg/include/rdbg/i386/Makefile.am delete mode 100644 c/src/librdbg/include/rdbg/m68k/.cvsignore delete mode 100644 c/src/librdbg/include/rdbg/m68k/Makefile.am delete mode 100644 c/src/librdbg/include/rdbg/powerpc/.cvsignore delete mode 100644 c/src/librdbg/include/rdbg/powerpc/Makefile.am diff --git a/c/src/ChangeLog b/c/src/ChangeLog index df72ef5970..ddd612a7d3 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,14 @@ +2004-02-13 Ralf Corsepius + + * librdbg/include/Makefile.am: Merge-in + librdbg/include/rdbg/i386/Makefile.am, + librdbg/include/rdbg/m68k/Makefile.am, librdbg/include/rdbg/Makefile.am, + librdbg/include/rdbg/powerpc/Makefile.am. + * librdbg/include/rdbg/i386/Makefile.am, + librdbg/include/rdbg/m68k/Makefile.am, librdbg/include/rdbg/Makefile.am, + librdbg/include/rdbg/powerpc/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-02-12 Ralf Corsepius * configure.ac: Use AS_HELP_STRING(ada). diff --git a/c/src/configure.ac b/c/src/configure.ac index 0361caabcc..b01f05d4a8 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -241,10 +241,6 @@ libnetworking/rtems_webserver/Makefile librdbg/Makefile librdbg/include/Makefile -librdbg/include/rdbg/Makefile -librdbg/include/rdbg/i386/Makefile -librdbg/include/rdbg/powerpc/Makefile -librdbg/include/rdbg/m68k/Makefile librdbg/src/Makefile librdbg/src/i386/Makefile librdbg/src/powerpc/Makefile diff --git a/c/src/librdbg/include/Makefile.am b/c/src/librdbg/include/Makefile.am index 307f21ed34..4e8c684479 100644 --- a/c/src/librdbg/include/Makefile.am +++ b/c/src/librdbg/include/Makefile.am @@ -2,7 +2,50 @@ ## $Id$ ## -SUBDIRS = rdbg +## 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/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/.cvsignore b/c/src/librdbg/include/rdbg/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/librdbg/include/rdbg/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/librdbg/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am deleted file mode 100644 index da76688469..0000000000 --- a/c/src/librdbg/include/rdbg/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## -## $Id$ -## - -if HAS_RDBG -include_rdbgdir = $(includedir)/rdbg - -include_rdbg_HEADERS = rdbg.h servrpc.h -endif - -all-local: $(PREINSTALL_FILES) - -if HAS_RDBG -SUBDIRS = $(RTEMS_CPU) -DIST_SUBDIRS = $(RTEMS_CPU) -endif - -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.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg.h - -$(PROJECT_INCLUDE)/rdbg/servrpc.h: servrpc.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/servrpc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/servrpc.h -endif - -CLEANFILES = $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) - -include $(top_srcdir)/automake/subdirs.am -include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/i386/.cvsignore b/c/src/librdbg/include/rdbg/i386/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/librdbg/include/rdbg/i386/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/librdbg/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am deleted file mode 100644 index 459e9d5787..0000000000 --- a/c/src/librdbg/include/rdbg/i386/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -include_rdbgdir = $(includedir)/rdbg - -include_rdbg_HEADERS = rdbg_f.h reg.h - -all-local: $(PREINSTALL_FILES) - -PREINSTALL_DIRS = -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/rdbg/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/rdbg - @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - -$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: 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: reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h - -CLEANFILES = $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) - -include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/m68k/.cvsignore b/c/src/librdbg/include/rdbg/m68k/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/librdbg/include/rdbg/m68k/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/librdbg/include/rdbg/m68k/Makefile.am b/c/src/librdbg/include/rdbg/m68k/Makefile.am deleted file mode 100644 index 459e9d5787..0000000000 --- a/c/src/librdbg/include/rdbg/m68k/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -include_rdbgdir = $(includedir)/rdbg - -include_rdbg_HEADERS = rdbg_f.h reg.h - -all-local: $(PREINSTALL_FILES) - -PREINSTALL_DIRS = -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/rdbg/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/rdbg - @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - -$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: 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: reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h - -CLEANFILES = $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) - -include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/powerpc/.cvsignore b/c/src/librdbg/include/rdbg/powerpc/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/librdbg/include/rdbg/powerpc/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am deleted file mode 100644 index 459e9d5787..0000000000 --- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -include_rdbgdir = $(includedir)/rdbg - -include_rdbg_HEADERS = rdbg_f.h reg.h - -all-local: $(PREINSTALL_FILES) - -PREINSTALL_DIRS = -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/rdbg/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/rdbg - @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - -$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: 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: reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h - -CLEANFILES = $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) - -include $(top_srcdir)/automake/local.am -- cgit v1.2.3