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/configure.in | 4 +--- c/src/tests/itrontests/configure.in | 3 +-- c/src/tests/libtests/configure.in | 3 +-- c/src/tests/mptests/configure.in | 3 +-- c/src/tests/psxtests/configure.in | 3 +-- c/src/tests/samples/configure.in | 3 +-- c/src/tests/samples/hello/Makefile.am | 2 +- c/src/tests/samples/ticker/Makefile.am | 2 +- c/src/tests/sptests/configure.in | 3 +-- c/src/tests/support/configure.in | 3 +-- c/src/tests/tmitrontests/configure.in | 3 +-- c/src/tests/tmtests/configure.in | 3 +-- c/src/tests/tools/configure.in | 3 ++- c/src/tests/tools/generic/configure.in | 3 ++- 14 files changed, 16 insertions(+), 25 deletions(-) (limited to 'c/src/tests') diff --git a/c/src/tests/configure.in b/c/src/tests/configure.in index 18edf934e1..2bbfb374f7 100644 --- a/c/src/tests/configure.in +++ b/c/src/tests/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_ENABLE_TESTS @@ -29,7 +28,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET dnl check for g++ @@ -71,7 +69,7 @@ AC_CONFIG_SUBDIRS(support) AC_CONFIG_SUBDIRS(samples) AC_CONFIG_SUBDIRS($cfg_subdirs) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile ) diff --git a/c/src/tests/itrontests/configure.in b/c/src/tests/itrontests/configure.in index 24de223cc8..c71d91c847 100644 --- a/c/src/tests/itrontests/configure.in +++ b/c/src/tests/itrontests/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -37,7 +36,7 @@ AC_SUBST(CC_CFLAGS_DEBUG_V) AC_SUBST(CC_CFLAGS_PROFILE_V) AC_SUBST(CC_LDFLAGS_PROFILE_V) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile itronhello/Makefile diff --git a/c/src/tests/libtests/configure.in b/c/src/tests/libtests/configure.in index adf3a6442b..a11a71c8b8 100644 --- a/c/src/tests/libtests/configure.in +++ b/c/src/tests/libtests/configure.in @@ -15,7 +15,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -40,7 +39,7 @@ AC_SUBST(BARE_CPU_MODEL) AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile cpuuse/Makefile diff --git a/c/src/tests/mptests/configure.in b/c/src/tests/mptests/configure.in index 35ab1f3174..73302b76c6 100644 --- a/c/src/tests/mptests/configure.in +++ b/c/src/tests/mptests/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENABLE_MULTIPROCESSING @@ -41,7 +40,7 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V) AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile mp01/Makefile diff --git a/c/src/tests/psxtests/configure.in b/c/src/tests/psxtests/configure.in index 36cb3d9b0b..460f7c9d23 100644 --- a/c/src/tests/psxtests/configure.in +++ b/c/src/tests/psxtests/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -37,7 +36,7 @@ AC_SUBST(CC_CFLAGS_DEBUG_V) AC_SUBST(CC_CFLAGS_PROFILE_V) AC_SUBST(CC_LDFLAGS_PROFILE_V) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile 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 diff --git a/c/src/tests/sptests/configure.in b/c/src/tests/sptests/configure.in index 1c3f871405..0225a1fab1 100644 --- a/c/src/tests/sptests/configure.in +++ b/c/src/tests/sptests/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -37,7 +36,7 @@ AC_SUBST(CC_CFLAGS_DEBUG_V) AC_SUBST(CC_CFLAGS_PROFILE_V) AC_SUBST(CC_LDFLAGS_PROFILE_V) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile sp01/Makefile diff --git a/c/src/tests/support/configure.in b/c/src/tests/support/configure.in index d4061915ca..c5314c7027 100644 --- a/c/src/tests/support/configure.in +++ b/c/src/tests/support/configure.in @@ -19,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +29,7 @@ RTEMS_CHECK_POSIX_API(RTEMS_BSP) AC_SUBST(BARE_CPU_CFLAGS) AC_SUBST(BARE_CPU_MODEL) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile diff --git a/c/src/tests/tmitrontests/configure.in b/c/src/tests/tmitrontests/configure.in index 02896d512f..01c59e3781 100644 --- a/c/src/tests/tmitrontests/configure.in +++ b/c/src/tests/tmitrontests/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -40,7 +39,7 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V) OPERATION_COUNT=${OPERATION_COUNT-100} AC_SUBST(OPERATION_COUNT) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile diff --git a/c/src/tests/tmtests/configure.in b/c/src/tests/tmtests/configure.in index 9541a0bcc7..7c1061ad92 100644 --- a/c/src/tests/tmtests/configure.in +++ b/c/src/tests/tmtests/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -40,7 +39,7 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V) OPERATION_COUNT=${OPERATION_COUNT-100} AC_SUBST(OPERATION_COUNT) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile diff --git a/c/src/tests/tools/configure.in b/c/src/tests/tools/configure.in index 85e2892dac..8d0ea53a5a 100644 --- a/c/src/tests/tools/configure.in +++ b/c/src/tests/tools/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-tests-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-tests-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_TOOLPATHS @@ -19,4 +19,5 @@ if test -d $srcdir/$RTEMS_CPU; then AC_CONFIG_SUBDIRS($RTEMS_CPU) fi +# Explicitly list all Makefiles here AC_OUTPUT(Makefile) diff --git a/c/src/tests/tools/generic/configure.in b/c/src/tests/tools/generic/configure.in index bcb17a75c3..f8de12a874 100644 --- a/c/src/tests/tools/generic/configure.in +++ b/c/src/tests/tools/generic/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-tests-tools-generic,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-tests-tools-generic,$RTEMS_VERSION,no) AM_MAINTAINER_MODE # Override the set of BSPs to be built. @@ -17,6 +17,7 @@ RTEMS_PROJECT_ROOT RTEMS_PATH_KSH +# Explicitly list all Makefiles here AC_OUTPUT( Makefile difftest -- cgit v1.2.3