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/tests/samples/configure.in | 3 +-- c/src/tests/samples/hello/Makefile.am | 2 +- c/src/tests/samples/ticker/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'c/src/tests/samples') diff --git a/c/src/tests/samples/configure.in b/c/src/tests/samples/configure.in index da5f09b402..ddb2c519c5 100644 --- a/c/src/tests/samples/configure.in +++ b/c/src/tests/samples/configure.in @@ -19,7 +19,6 @@ RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -44,7 +43,7 @@ RTEMS_CHECK_CXX(RTEMS_BSP) AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile base_sp/Makefile diff --git a/c/src/tests/samples/hello/Makefile.am b/c/src/tests/samples/hello/Makefile.am index 9a17fdd42e..8f3ec339ab 100644 --- a/c/src/tests/samples/hello/Makefile.am +++ b/c/src/tests/samples/hello/Makefile.am @@ -38,6 +38,6 @@ all-local: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST += $(C_FILES) $(DOCS) +EXTRA_DIST = $(C_FILES) $(DOCS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/samples/ticker/Makefile.am b/c/src/tests/samples/ticker/Makefile.am index 6ecd8d4edc..7c699ce03b 100644 --- a/c/src/tests/samples/ticker/Makefile.am +++ b/c/src/tests/samples/ticker/Makefile.am @@ -38,6 +38,6 @@ all-local: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST += $(C_FILES) $(DOCS) +EXTRA_DIST = $(C_FILES) $(DOCS) include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3