From 70810dcd8970194d96f685ffe4af890911e273c5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Feb 2000 22:33:25 +0000 Subject: Patches rtems-rc-20000204-0.diff from Ralf Corsepius that contains: * Removes remaining (now illegal) references to $(SRC) from a couple of Makefile.ams * Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in * Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR from most configure scripts, i.e. LIBCDIR becomes less visible) * Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to libbsp/*/configure.ins (A minor bug in previous implementations, which only has an impact when switching to GNU/Cygnus canonicalization) * Cleans up several bogus comments. * Removes MKLIB * Switches the version number to 4.5.0 (for testing version number handling) --- c/src/librdbg/configure.in | 4 +--- c/src/librdbg/include/Makefile.am | 1 - c/src/librdbg/src/Makefile.am | 20 ++++---------------- c/src/librdbg/src/i386/Makefile.am | 1 - c/src/librdbg/src/powerpc/Makefile.am | 1 - 5 files changed, 5 insertions(+), 22 deletions(-) (limited to 'c/src/librdbg') diff --git a/c/src/librdbg/configure.in b/c/src/librdbg/configure.in index 8711f6ba59..e531a01440 100644 --- a/c/src/librdbg/configure.in +++ b/c/src/librdbg/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_RDBG -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +21,6 @@ RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -49,7 +47,7 @@ AM_CONDITIONAL(HAS_RDBG,test "$HAS_RDBG" = "yes") RTEMS_PROJECT_ROOT -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile diff --git a/c/src/librdbg/include/Makefile.am b/c/src/librdbg/include/Makefile.am index 1f56857d20..03d6d96407 100644 --- a/c/src/librdbg/include/Makefile.am +++ b/c/src/librdbg/include/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = rdbg diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am index 1b0435f479..3e41bfc8ad 100644 --- a/c/src/librdbg/src/Makefile.am +++ b/c/src/librdbg/src/Makefile.am @@ -1,25 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = $(RTEMS_CPU) -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 +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 diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am index 80b46a330e..9fec02b48f 100644 --- a/c/src/librdbg/src/i386/Makefile.am +++ b/c/src/librdbg/src/i386/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = any diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am index 14f0f46763..006c0d9867 100644 --- a/c/src/librdbg/src/powerpc/Makefile.am +++ b/c/src/librdbg/src/powerpc/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = mcp750 -- cgit v1.2.3