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/include/Makefile.am | 4 ++-- c/src/librdbg/include/rdbg/Makefile.am | 9 +++------ c/src/librdbg/include/rdbg/i386/Makefile.am | 2 +- c/src/librdbg/include/rdbg/m68k/Makefile.am | 2 +- c/src/librdbg/include/rdbg/powerpc/Makefile.am | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) (limited to 'c/src/librdbg/include') diff --git a/c/src/librdbg/include/Makefile.am b/c/src/librdbg/include/Makefile.am index 5d7e7a2ec3..9cb3f2ae03 100644 --- a/c/src/librdbg/include/Makefile.am +++ b/c/src/librdbg/include/Makefile.am @@ -5,5 +5,5 @@ SUBDIRS = rdbg -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/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am index 236d89e5de..4a21a83c92 100644 --- a/c/src/librdbg/include/rdbg/Makefile.am +++ b/c/src/librdbg/include/rdbg/Makefile.am @@ -2,10 +2,9 @@ ## $Id$ ## - +if HAS_RDBG include_rdbgdir = $(includedir)/rdbg -if HAS_RDBG include_rdbg_HEADERS = rdbg.h servrpc.h PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg \ @@ -23,7 +22,5 @@ if HAS_RDBG SUBDIRS = $(RTEMS_CPU) endif -EXTRA_DIST = rdbg.h servrpc.h - -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/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am index 18c9b52acf..e5fb159ff1 100644 --- a/c/src/librdbg/include/rdbg/i386/Makefile.am +++ b/c/src/librdbg/include/rdbg/i386/Makefile.am @@ -17,4 +17,4 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../automake/local.am diff --git a/c/src/librdbg/include/rdbg/m68k/Makefile.am b/c/src/librdbg/include/rdbg/m68k/Makefile.am index 18c9b52acf..e5fb159ff1 100644 --- a/c/src/librdbg/include/rdbg/m68k/Makefile.am +++ b/c/src/librdbg/include/rdbg/m68k/Makefile.am @@ -17,4 +17,4 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../automake/local.am diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am index 18c9b52acf..e5fb159ff1 100644 --- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am +++ b/c/src/librdbg/include/rdbg/powerpc/Makefile.am @@ -17,4 +17,4 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../automake/local.am -- cgit v1.2.3