diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-08 22:33:25 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-08 22:33:25 +0000 |
commit | 70810dcd8970194d96f685ffe4af890911e273c5 (patch) | |
tree | cade3ccf39b9bcabc04e7b1ce9105a83f80b177d /c/src/lib/libbsp/i386 | |
parent | changed version to 4.5.0-beta1 (diff) | |
download | rtems-70810dcd8970194d96f685ffe4af890911e273c5.tar.bz2 |
Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
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)
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/i386/configure.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/configure.in | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/configure.in | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/tools/configure.in | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/configure.in | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/tools/configure.in | 3 |
6 files changed, 22 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/i386/configure.in b/c/src/lib/libbsp/i386/configure.in index 8538f5a7a7..5cffc5f181 100644 --- a/c/src/lib/libbsp/i386/configure.in +++ b/c/src/lib/libbsp/i386/configure.in @@ -19,7 +19,7 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# Explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile shared/Makefile diff --git a/c/src/lib/libbsp/i386/i386ex/configure.in b/c/src/lib/libbsp/i386/i386ex/configure.in index db4a1f64e0..44c0f81aa0 100644 --- a/c/src/lib/libbsp/i386/i386ex/configure.in +++ b/c/src/lib/libbsp/i386/i386ex/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-i386ex,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) @@ -23,10 +24,11 @@ dnl if this is an i386, does gas have good code16 support? RTEMS_I386_GAS_CODE16 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes"); -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -# Explicitly list all Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libbsp/i386/pc386/configure.in b/c/src/lib/libbsp/i386/pc386/configure.in index 5cddda121c..7d07b85e60 100644 --- a/c/src/lib/libbsp/i386/pc386/configure.in +++ b/c/src/lib/libbsp/i386/pc386/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-pc386,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) @@ -23,13 +24,15 @@ dnl if this is an i386, does gas have good code16 support? RTEMS_I386_GAS_CODE16 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes"); -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_SUBDIRS(tools) AC_SUBST(RTEMS_BSP) -# Explicitly list all Makefile here + +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.in b/c/src/lib/libbsp/i386/pc386/tools/configure.in index 853d7bfb78..2d2155e62b 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/configure.in +++ b/c/src/lib/libbsp/i386/pc386/tools/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE AC_EXEEXT @@ -20,5 +20,6 @@ AC_CHECK_FUNCS(strtoul) RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.in b/c/src/lib/libbsp/i386/ts_386ex/configure.in index 68ffccec5b..86aecd6b0c 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/configure.in +++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in @@ -8,10 +8,11 @@ RTEMS_TOP(../../../../../..) AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-ts_i386ex,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-ts_386ex,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) @@ -23,12 +24,13 @@ dnl if this is an i386, does gas have good code16 support? RTEMS_I386_GAS_CODE16 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes"); -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_SUBDIRS(tools) -# Explicitly list all Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/configure.in b/c/src/lib/libbsp/i386/ts_386ex/tools/configure.in index e9db1bad01..fdb82c285a 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/configure.in +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/configure.in @@ -8,12 +8,13 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-ts_386ex-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-ts_386ex-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile dos_sup/Makefile |