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/a29k/configure.in | 2 +- c/src/lib/libbsp/a29k/portsw/configure.in | 9 +++++---- c/src/lib/libbsp/bare/configure.in | 2 +- c/src/lib/libbsp/configure.in | 13 +++++-------- c/src/lib/libbsp/hppa1.1/configure.in | 2 +- c/src/lib/libbsp/hppa1.1/simhppa/configure.in | 9 +++++---- c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in | 3 ++- c/src/lib/libbsp/i386/configure.in | 2 +- c/src/lib/libbsp/i386/i386ex/configure.in | 8 +++++--- c/src/lib/libbsp/i386/pc386/configure.in | 9 ++++++--- c/src/lib/libbsp/i386/pc386/tools/configure.in | 3 ++- c/src/lib/libbsp/i386/ts_386ex/configure.in | 10 ++++++---- c/src/lib/libbsp/i386/ts_386ex/tools/configure.in | 3 ++- c/src/lib/libbsp/i960/configure.in | 2 +- c/src/lib/libbsp/i960/cvme961/configure.in | 9 +++++---- c/src/lib/libbsp/i960/rxgen960/configure.in | 9 +++++---- c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am | 12 ------------ c/src/lib/libbsp/m68k/configure.in | 2 +- c/src/lib/libbsp/m68k/dmv152/configure.in | 5 +++-- c/src/lib/libbsp/m68k/efi332/configure.in | 5 +++-- c/src/lib/libbsp/m68k/efi68k/configure.in | 5 +++-- c/src/lib/libbsp/m68k/gen68302/configure.in | 5 +++-- c/src/lib/libbsp/m68k/gen68340/configure.in | 5 +++-- c/src/lib/libbsp/m68k/gen68360/configure.in | 10 ++++++---- c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am | 6 +++++- c/src/lib/libbsp/m68k/idp/configure.in | 5 +++-- c/src/lib/libbsp/m68k/mvme136/configure.in | 5 +++-- c/src/lib/libbsp/m68k/mvme147/configure.in | 5 +++-- c/src/lib/libbsp/m68k/mvme147s/configure.in | 5 +++-- c/src/lib/libbsp/m68k/mvme162/configure.in | 9 +++++---- c/src/lib/libbsp/m68k/mvme162/tools/configure.in | 3 ++- c/src/lib/libbsp/m68k/mvme167/configure.in | 5 +++-- c/src/lib/libbsp/m68k/ods68302/configure.in | 5 +++-- c/src/lib/libbsp/mips/configure.in | 2 +- c/src/lib/libbsp/mips/p4000/configure.in | 5 +++-- c/src/lib/libbsp/mips64orion/configure.in | 2 +- c/src/lib/libbsp/mips64orion/p4000/configure.in | 5 +++-- c/src/lib/libbsp/no_cpu/configure.in | 2 +- c/src/lib/libbsp/no_cpu/no_bsp/configure.in | 9 +++++---- 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 +++-- c/src/lib/libbsp/sh/configure.in | 2 +- c/src/lib/libbsp/sh/gensh1/configure.in | 4 +++- c/src/lib/libbsp/sh/gensh2/configure.in | 5 +++-- c/src/lib/libbsp/sparc/configure.in | 2 +- c/src/lib/libbsp/sparc/erc32/configure.in | 9 +++++---- c/src/lib/libbsp/sparc/erc32/tools/configure.in | 3 ++- c/src/lib/libbsp/unix/configure.in | 2 +- c/src/lib/libbsp/unix/posix/configure.in | 9 ++++++--- c/src/lib/libbsp/unix/posix/tools/configure.in | 3 ++- 58 files changed, 183 insertions(+), 139 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/a29k/configure.in b/c/src/lib/libbsp/a29k/configure.in index 6488100467..a5beaf60d7 100644 --- a/c/src/lib/libbsp/a29k/configure.in +++ b/c/src/lib/libbsp/a29k/configure.in @@ -19,6 +19,6 @@ 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) diff --git a/c/src/lib/libbsp/a29k/portsw/configure.in b/c/src/lib/libbsp/a29k/portsw/configure.in index 6c62708600..cf15f86827 100644 --- a/c/src/lib/libbsp/a29k/portsw/configure.in +++ b/c/src/lib/libbsp/a29k/portsw/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-a29k-portsw,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,11 +21,11 @@ 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") -# Explicitly list a Makefile here +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile console/Makefile diff --git a/c/src/lib/libbsp/bare/configure.in b/c/src/lib/libbsp/bare/configure.in index 517102de4b..51cc75aff5 100644 --- a/c/src/lib/libbsp/bare/configure.in +++ b/c/src/lib/libbsp/bare/configure.in @@ -18,7 +18,7 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile) diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in index f522117421..70cbabb8d3 100644 --- a/c/src/lib/libbsp/configure.in +++ b/c/src/lib/libbsp/configure.in @@ -12,7 +12,8 @@ AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -20,12 +21,6 @@ RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT - -dnl check target cc -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) @@ -59,7 +54,9 @@ cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR" AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") AC_CONFIG_SUBDIRS($cfg_subdirs) -# Explicitly list all Makefiles +RTEMS_PROJECT_ROOT + +# Explicitly list all Makefiles here AC_OUTPUT( Makefile shmdr/Makefile) diff --git a/c/src/lib/libbsp/hppa1.1/configure.in b/c/src/lib/libbsp/hppa1.1/configure.in index 27118a3377..5853647c0b 100644 --- a/c/src/lib/libbsp/hppa1.1/configure.in +++ b/c/src/lib/libbsp/hppa1.1/configure.in @@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in index 902c705381..89137d7f38 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1-simhppa,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,13 +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 include/Makefile diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in index 5ea7d6d9e6..7ac66e771b 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-hppa-simhppa-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1-simhppa-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE AC_EXEEXT @@ -20,5 +20,6 @@ AM_CONFIG_HEADER(config.h) RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) 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 diff --git a/c/src/lib/libbsp/i960/configure.in b/c/src/lib/libbsp/i960/configure.in index e9b306361c..6b20653fb3 100644 --- a/c/src/lib/libbsp/i960/configure.in +++ b/c/src/lib/libbsp/i960/configure.in @@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in index 2fcffc49dd..0de4f5d17e 100644 --- a/c/src/lib/libbsp/i960/cvme961/configure.in +++ b/c/src/lib/libbsp/i960/cvme961/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-cvme961,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,11 +21,11 @@ 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") -# 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/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in index f974725f55..7863bfb9cf 100644 --- a/c/src/lib/libbsp/i960/rxgen960/configure.in +++ b/c/src/lib/libbsp/i960/rxgen960/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-rxgen960,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,11 +21,11 @@ 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") -# 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/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am index a255a83daa..11a7554242 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am @@ -32,18 +32,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -# FIXME: The original Makefile.in contained this: -#> XXX: JRS look at the list of objects installed -#> $(INSTALL_CHANGE) -m 644 $(OBJS) $(PROJECT_RELEASE)/lib -# -# The install_change line could probably be replaced by this: -# $(PROJECT_RELEASE)/lib/%.o: $(ARCH)/%.o -# $(INSTALL_DATA) $< $@ -# TMPINSTALL_FILES += \ -# $(OBJS:$(ARCH)/%.o=$(PROJECT_RELEASE)/lib/%.o) -# -# .. but this behavior seems to be rather questionable :( - $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(INSTALL_DATA) $< $@ diff --git a/c/src/lib/libbsp/m68k/configure.in b/c/src/lib/libbsp/m68k/configure.in index 3dac2230e9..9f7909b448 100644 --- a/c/src/lib/libbsp/m68k/configure.in +++ b/c/src/lib/libbsp/m68k/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/m68k/dmv152/configure.in b/c/src/lib/libbsp/m68k/dmv152/configure.in index f33ffbb8a5..cdfd98b536 100644 --- a/c/src/lib/libbsp/m68k/dmv152/configure.in +++ b/c/src/lib/libbsp/m68k/dmv152/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-dmv152,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/efi332/configure.in b/c/src/lib/libbsp/m68k/efi332/configure.in index 8152a5aad9..b10452a4fe 100644 --- a/c/src/lib/libbsp/m68k/efi332/configure.in +++ b/c/src/lib/libbsp/m68k/efi332/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi332,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/efi68k/configure.in b/c/src/lib/libbsp/m68k/efi68k/configure.in index 7f59ca61b4..0a07be38c6 100644 --- a/c/src/lib/libbsp/m68k/efi68k/configure.in +++ b/c/src/lib/libbsp/m68k/efi68k/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi68k,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/gen68302/configure.in b/c/src/lib/libbsp/m68k/gen68302/configure.in index 8d9c4d4d8e..f5daf792a6 100644 --- a/c/src/lib/libbsp/m68k/gen68302/configure.in +++ b/c/src/lib/libbsp/m68k/gen68302/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68302,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.in b/c/src/lib/libbsp/m68k/gen68340/configure.in index a7af732493..7e24feb3d8 100644 --- a/c/src/lib/libbsp/m68k/gen68340/configure.in +++ b/c/src/lib/libbsp/m68k/gen68340/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68340,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.in b/c/src/lib/libbsp/m68k/gen68360/configure.in index 2681e04884..73266d8d9e 100644 --- a/c/src/lib/libbsp/m68k/gen68360/configure.in +++ b/c/src/lib/libbsp/m68k/gen68360/configure.in @@ -8,10 +8,11 @@ RTEMS_TOP(../../../../../..) AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-dmv152,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68360,$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) @@ -19,10 +20,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "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/m68k/gen68360/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am index 1a2848b7a6..c10a8eb294 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am @@ -33,9 +33,13 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(PROJECT_RELEASE)/lib/linkcmds.prom: linkcmds.prom $(INSTALL_DATA) $< $@ +$(PROJECT_RELEASE)/lib/linkcmds.bootp: linkcmds.bootp + $(INSTALL_DATA) $< $@ + # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds.prom + $(PROJECT_RELEASE)/lib/linkcmds.prom \ + $(PROJECT_RELEASE)/lib/linkcmds.bootp all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/m68k/idp/configure.in b/c/src/lib/libbsp/m68k/idp/configure.in index de18e48148..527802ca24 100644 --- a/c/src/lib/libbsp/m68k/idp/configure.in +++ b/c/src/lib/libbsp/m68k/idp/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-idp,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme136/configure.in b/c/src/lib/libbsp/m68k/mvme136/configure.in index 6e59adc2b4..73e84bf628 100644 --- a/c/src/lib/libbsp/m68k/mvme136/configure.in +++ b/c/src/lib/libbsp/m68k/mvme136/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme136,$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,7 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "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/m68k/mvme147/configure.in b/c/src/lib/libbsp/m68k/mvme147/configure.in index 8ac430c2d2..cec018ab89 100644 --- a/c/src/lib/libbsp/m68k/mvme147/configure.in +++ b/c/src/lib/libbsp/m68k/mvme147/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme147,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.in b/c/src/lib/libbsp/m68k/mvme147s/configure.in index 6278fedb18..1aa24ffe3a 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/configure.in +++ b/c/src/lib/libbsp/m68k/mvme147s/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme147s,$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,7 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "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/m68k/mvme162/configure.in b/c/src/lib/libbsp/m68k/mvme162/configure.in index a8a1d4f0ee..8a22c3f936 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.in +++ b/c/src/lib/libbsp/m68k/mvme162/configure.in @@ -11,18 +11,19 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme162,$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) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT - 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/m68k/mvme162/tools/configure.in b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in index 2fb3b588a7..514451c0bd 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in +++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-m68k-mvme162-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme162-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE AC_EXEEXT @@ -21,5 +21,6 @@ AC_FUNC_MMAP RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.in b/c/src/lib/libbsp/m68k/mvme167/configure.in index 3c4a5a4741..02052ba27e 100644 --- a/c/src/lib/libbsp/m68k/mvme167/configure.in +++ b/c/src/lib/libbsp/m68k/mvme167/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme167,$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 clock/Makefile diff --git a/c/src/lib/libbsp/m68k/ods68302/configure.in b/c/src/lib/libbsp/m68k/ods68302/configure.in index 588b4b70a1..4885efbf4a 100644 --- a/c/src/lib/libbsp/m68k/ods68302/configure.in +++ b/c/src/lib/libbsp/m68k/ods68302/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-ods68302,$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 clock/Makefile diff --git a/c/src/lib/libbsp/mips/configure.in b/c/src/lib/libbsp/mips/configure.in index 63c7590854..a82ebfd0c7 100644 --- a/c/src/lib/libbsp/mips/configure.in +++ b/c/src/lib/libbsp/mips/configure.in @@ -19,6 +19,6 @@ 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) diff --git a/c/src/lib/libbsp/mips/p4000/configure.in b/c/src/lib/libbsp/mips/p4000/configure.in index 7398cc13bc..d174046a9a 100644 --- a/c/src/lib/libbsp/mips/p4000/configure.in +++ b/c/src/lib/libbsp/mips/p4000/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion-p4000,$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 console/Makefile diff --git a/c/src/lib/libbsp/mips64orion/configure.in b/c/src/lib/libbsp/mips64orion/configure.in index 63c7590854..a82ebfd0c7 100644 --- a/c/src/lib/libbsp/mips64orion/configure.in +++ b/c/src/lib/libbsp/mips64orion/configure.in @@ -19,6 +19,6 @@ 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) diff --git a/c/src/lib/libbsp/mips64orion/p4000/configure.in b/c/src/lib/libbsp/mips64orion/p4000/configure.in index 7398cc13bc..d174046a9a 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/configure.in +++ b/c/src/lib/libbsp/mips64orion/p4000/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion-p4000,$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 console/Makefile diff --git a/c/src/lib/libbsp/no_cpu/configure.in b/c/src/lib/libbsp/no_cpu/configure.in index 6da3fd2deb..f0ea16a611 100644 --- a/c/src/lib/libbsp/no_cpu/configure.in +++ b/c/src/lib/libbsp/no_cpu/configure.in @@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in index 29e39570a6..cbc96c8cdf 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-no_bsp,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -20,11 +21,11 @@ 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") -# 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/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 diff --git a/c/src/lib/libbsp/sh/configure.in b/c/src/lib/libbsp/sh/configure.in index 0019a783ab..df5c41355e 100644 --- a/c/src/lib/libbsp/sh/configure.in +++ b/c/src/lib/libbsp/sh/configure.in @@ -19,7 +19,7 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile shared/Makefile) diff --git a/c/src/lib/libbsp/sh/gensh1/configure.in b/c/src/lib/libbsp/sh/gensh1/configure.in index d15a1e7d41..8013d3bab2 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.in +++ b/c/src/lib/libbsp/sh/gensh1/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh-gensh1,$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,6 +21,7 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT +# Explicitly list all Makefiles here AC_OUTPUT( Makefile console/Makefile diff --git a/c/src/lib/libbsp/sh/gensh2/configure.in b/c/src/lib/libbsp/sh/gensh2/configure.in index 0a70747caa..e84f83d273 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.in +++ b/c/src/lib/libbsp/sh/gensh2/configure.in @@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh-gensh2,$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 console/Makefile diff --git a/c/src/lib/libbsp/sparc/configure.in b/c/src/lib/libbsp/sparc/configure.in index 4fbf519a74..45766323cb 100644 --- a/c/src/lib/libbsp/sparc/configure.in +++ b/c/src/lib/libbsp/sparc/configure.in @@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/sparc/erc32/configure.in b/c/src/lib/libbsp/sparc/erc32/configure.in index 252739c2bf..b22e8f88d0 100644 --- a/c/src/lib/libbsp/sparc/erc32/configure.in +++ b/c/src/lib/libbsp/sparc/erc32/configure.in @@ -11,18 +11,19 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc-erc32,$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) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST -RTEMS_PROJECT_ROOT - 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/sparc/erc32/tools/configure.in b/c/src/lib/libbsp/sparc/erc32/tools/configure.in index 5fcc353a7d..b4f7e62449 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/configure.in +++ b/c/src/lib/libbsp/sparc/erc32/tools/configure.in @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-lib-libbsp-sparc-erc32-tools,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc-erc32-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_PATH_KSH @@ -16,6 +16,7 @@ RTEMS_PATH_KSH RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS +# Explicitly list all Makefiles here AC_OUTPUT( Makefile runtest) diff --git a/c/src/lib/libbsp/unix/configure.in b/c/src/lib/libbsp/unix/configure.in index 7bf7d9998e..fbaeb71d48 100644 --- a/c/src/lib/libbsp/unix/configure.in +++ b/c/src/lib/libbsp/unix/configure.in @@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) AC_CONFIG_SUBDIRS($bspdir) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) 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