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/lib/libbsp/unix/posix/configure.in | 9 ++++++--- c/src/lib/libbsp/unix/posix/tools/configure.in | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'c/src/lib/libbsp/unix/posix') diff --git a/c/src/lib/libbsp/unix/posix/configure.in b/c/src/lib/libbsp/unix/posix/configure.in index 039d78e486..24398e2a0b 100644 --- a/c/src/lib/libbsp/unix/posix/configure.in +++ b/c/src/lib/libbsp/unix/posix/configure.in @@ -11,7 +11,9 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_PROG_CXX_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_CXX @@ -22,14 +24,15 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CANONICAL_HOST RTEMS_CHECK_CXX -RTEMS_PROJECT_ROOT AC_CONFIG_SUBDIRS(tools) AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") -# Explicitly list a Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libbsp/unix/posix/tools/configure.in b/c/src/lib/libbsp/unix/posix/tools/configure.in index 0efb748365..902766d284 100644 --- a/c/src/lib/libbsp/unix/posix/tools/configure.in +++ b/c/src/lib/libbsp/unix/posix/tools/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-unix-posix-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_PATH_KSH @@ -19,6 +19,7 @@ AM_CONDITIONAL(PERL,test -n "$PERL") RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile runtest -- cgit v1.2.3