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/powerpc/configure.in | 2 +- c/src/lib/libbsp/powerpc/dmv177/configure.in | 8 +++++--- c/src/lib/libbsp/powerpc/eth_comm/configure.in | 8 +++++--- c/src/lib/libbsp/powerpc/helas403/configure.in | 8 +++++--- c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in | 8 +++++--- c/src/lib/libbsp/powerpc/papyrus/configure.in | 8 +++++--- c/src/lib/libbsp/powerpc/ppcn_60x/configure.in | 8 ++++---- c/src/lib/libbsp/powerpc/psim/configure.in | 8 +++++--- c/src/lib/libbsp/powerpc/psim/tools/configure.in | 3 ++- c/src/lib/libbsp/powerpc/score603e/configure.in | 5 +++-- 10 files changed, 40 insertions(+), 26 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/configure.in b/c/src/lib/libbsp/powerpc/configure.in index 6326c7e06d..263198276b 100644 --- a/c/src/lib/libbsp/powerpc/configure.in +++ b/c/src/lib/libbsp/powerpc/configure.in @@ -20,7 +20,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/powerpc/dmv177/configure.in b/c/src/lib/libbsp/powerpc/dmv177/configure.in index 100b0d0667..dccadc4fee 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.in +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-dmv177,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING @@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "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/powerpc/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in index c176cdafe0..241c776c0c 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-eth_comm,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING @@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Explicitly list a Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile canbus/Makefile diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.in b/c/src/lib/libbsp/powerpc/helas403/configure.in index 6c7c948394..cfa62fec4b 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.in +++ b/c/src/lib/libbsp/powerpc/helas403/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-helas403,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING @@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Explicitly list a Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile dlentry/Makefile diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in index 19a3b557d5..bbfdf37013 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-motorola_powerpc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING @@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Explicitly list a Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile bootloader/Makefile diff --git a/c/src/lib/libbsp/powerpc/papyrus/configure.in b/c/src/lib/libbsp/powerpc/papyrus/configure.in index e046ab797f..1c1d473a15 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/configure.in +++ b/c/src/lib/libbsp/powerpc/papyrus/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-papyrus,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING @@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Explicitly list a Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile dlentry/Makefile diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in index c1eca406a8..ae966a2b54 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-ppcn_60x,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,16 +21,15 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT - # Don't build the network directory # The problem is that the code there has not yet been converted to # bsd networking AM_CONDITIONAL(HAS_NETWORKING,false) # AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +RTEMS_PROJECT_ROOT -# Explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libbsp/powerpc/psim/configure.in b/c/src/lib/libbsp/powerpc/psim/configure.in index 7a86b783a8..ec50803f96 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.in +++ b/c/src/lib/libbsp/powerpc/psim/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-psim,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,12 +21,13 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") AC_CONFIG_SUBDIRS(tools) -# 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/powerpc/psim/tools/configure.in b/c/src/lib/libbsp/powerpc/psim/tools/configure.in index 39fa2825ea..15a7e36ee2 100644 --- a/c/src/lib/libbsp/powerpc/psim/tools/configure.in +++ b/c/src/lib/libbsp/powerpc/psim/tools/configure.in @@ -8,11 +8,12 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-powerpc-psim-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-psim-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.in b/c/src/lib/libbsp/powerpc/score603e/configure.in index 6904d2a02e..725a3c0ccd 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.in +++ b/c/src/lib/libbsp/powerpc/score603e/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-score603e,$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) @@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -# Explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile PCI_bus/Makefile -- cgit v1.2.3