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/configure.in | 3 +- c/make/Makefile.am | 15 ++++---- c/make/configure.in | 10 +---- c/src/configure.in | 1 + c/src/exec/configure.in | 4 +- c/src/exec/itron/configure.in | 6 +-- c/src/exec/itron/src/Makefile.am | 1 - c/src/exec/libcsupport/src/Makefile.am | 2 - c/src/exec/posix/configure.in | 6 +-- c/src/exec/posix/src/Makefile.am | 3 +- c/src/exec/rtems/src/Makefile.am | 3 +- c/src/exec/sapi/src/Makefile.am | 1 - c/src/exec/score/cpu/a29k/configure.in | 5 +-- c/src/exec/score/cpu/hppa1.1/configure.in | 5 +-- c/src/exec/score/cpu/i386/configure.in | 5 +-- c/src/exec/score/cpu/i960/configure.in | 5 +-- c/src/exec/score/cpu/m68k/configure.in | 5 +-- c/src/exec/score/cpu/mips/configure.in | 5 +-- c/src/exec/score/cpu/mips64orion/configure.in | 5 +-- c/src/exec/score/cpu/no_cpu/configure.in | 7 +--- c/src/exec/score/cpu/powerpc/configure.in | 5 +-- c/src/exec/score/cpu/sh/configure.in | 5 +-- c/src/exec/score/cpu/sparc/configure.in | 5 +-- c/src/exec/score/cpu/unix/configure.in | 4 +- c/src/exec/score/src/Makefile.am | 1 - c/src/lib/configure.in | 4 +- 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 +++-- .../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 ++-- .../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 +- c/src/lib/libc/Makefile.am | 2 - c/src/lib/libcpu/a29k/clock/Makefile.am | 2 +- c/src/lib/libcpu/a29k/configure.in | 4 +- c/src/lib/libcpu/a29k/timer/Makefile.am | 4 +- c/src/lib/libcpu/configure.in | 1 + c/src/lib/libcpu/hppa1.1/configure.in | 4 +- c/src/lib/libcpu/i386/configure.in | 4 +- c/src/lib/libcpu/m68k/configure.in | 4 +- c/src/lib/libcpu/mips/configure.in | 4 +- c/src/lib/libcpu/mips64orion/configure.in | 4 +- c/src/lib/libcpu/powerpc/configure.in | 4 +- c/src/lib/libcpu/sh/configure.in | 4 +- c/src/lib/libcpu/sparc/configure.in | 4 +- c/src/libchip/configure.in | 4 +- c/src/libchip/network/Makefile.am | 43 ++++++++++------------ c/src/libchip/rtc/Makefile.am | 3 +- c/src/libchip/serial/Makefile.am | 3 +- c/src/libmisc/configure.in | 4 +- c/src/libmisc/cpuuse/Makefile.am | 29 +++++++-------- c/src/libmisc/monitor/Makefile.am | 34 +++++++++-------- c/src/libmisc/rtmonuse/Makefile.am | 29 +++++++-------- c/src/libmisc/stackchk/Makefile.am | 29 +++++++-------- c/src/libmisc/untar/Makefile.am | 29 +++++++-------- c/src/libmisc/wrapup/Makefile.am | 27 +++++++------- c/src/libnetworking/configure.in | 6 +-- c/src/librdbg/configure.in | 4 +- c/src/librdbg/include/Makefile.am | 1 - c/src/librdbg/src/Makefile.am | 20 ++-------- c/src/librdbg/src/i386/Makefile.am | 1 - c/src/librdbg/src/powerpc/Makefile.am | 1 - c/src/librpc/configure.in | 4 +- c/src/librtems++/configure.in | 2 +- c/src/make/compilers/gcc-target-default.cfg | 16 -------- c/src/make/configure.in | 3 +- c/src/make/lib.cfg | 2 +- 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 +- 133 files changed, 363 insertions(+), 460 deletions(-) (limited to 'c') diff --git a/c/configure.in b/c/configure.in index 5bae4f4081..ab7bb9b1ca 100644 --- a/c/configure.in +++ b/c/configure.in @@ -100,8 +100,7 @@ AC_SUBST(RTEMS_BSP_LIST) AC_CONFIG_SUBDIRS(make) -AC_CONFIG_SUBDIRS(make) - +# Explicitly list all Makefiles here AC_OUTPUT( Makefile ) diff --git a/c/make/Makefile.am b/c/make/Makefile.am index b1d7b6367f..104e41cc61 100644 --- a/c/make/Makefile.am +++ b/c/make/Makefile.am @@ -1,17 +1,16 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -rtems_makedir=$(prefix)/make +rtems_makedir = $(prefix)/make -GENERIC_FILES = \ -target.cfg +GENERIC_FILES = target.cfg -rtems_make_DATA = \ -$(GENERIC_FILES) +rtems_make_DATA = $(GENERIC_FILES) + +EXTRA_DIST = target.cfg.in -include $(top_srcdir)/../../automake/subdirs.am include $(top_srcdir)/../../automake/local.am diff --git a/c/make/configure.in b/c/make/configure.in index 24d8113062..6240f19e8c 100644 --- a/c/make/configure.in +++ b/c/make/configure.in @@ -24,14 +24,12 @@ RTEMS_ENABLE_RDBG RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET dnl check for g++ @@ -44,17 +42,11 @@ RTEMS_CANONICALIZE_TOOLS AC_SUBST(rtems_cv_prog_cc_cross) AC_SUBST(RTEMS_HAS_POSIX) AC_SUBST(RTEMS_HOST) -AC_SUBST(RTEMS_HAS_MULTIPROCESSING) -AC_SUBST(RTEMS_HAS_POSIX_API) -AC_SUBST(RTEMS_HAS_ITRON_API) -AC_SUBST(RTEMS_HAS_NETWORKING) -AC_SUBST(RTEMS_HAS_RDBG) AC_SUBST(RTEMS_HAS_CPLUSPLUS) -AC_SUBST(RTEMS_USE_MACROS) AC_SUBST(RTEMS_USE_GCC272) -AC_SUBST(RTEMS_LIBC_DIR) AC_SUBST(RTEMS_CPU) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile target.cfg diff --git a/c/src/configure.in b/c/src/configure.in index 9344cf7e3f..b13a6c4544 100644 --- a/c/src/configure.in +++ b/c/src/configure.in @@ -57,6 +57,7 @@ AC_CONFIG_SUBDIRS(tests) RTEMS_PROJECT_ROOT +# Explicitly list all Makefiles here AC_OUTPUT( Makefile wrapup/Makefile diff --git a/c/src/exec/configure.in b/c/src/exec/configure.in index e31f162b92..9e7cbf77d5 100644 --- a/c/src/exec/configure.in +++ b/c/src/exec/configure.in @@ -16,7 +16,6 @@ RTEMS_ENABLE_POSIX RTEMS_ENABLE_ITRON RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENV_RTEMSBSP @@ -25,7 +24,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -69,7 +67,7 @@ fi AC_CONFIG_SUBDIRS($cfg_subdirs) AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/itron/configure.in b/c/src/exec/itron/configure.in index 5632736d89..2f26d46199 100644 --- a/c/src/exec/itron/configure.in +++ b/c/src/exec/itron/configure.in @@ -23,10 +23,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -## FIXME: needed for INSTALL_CHANGE in autoconf subdirectories -RTEMS_PATH_KSH - -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -60,7 +56,7 @@ fi ## ## FIXME: We configure and build the macros subdirectory, too. ## Should probably use AM_CONDITIONALs to disable them in future -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile src/Makefile diff --git a/c/src/exec/itron/src/Makefile.am b/c/src/exec/itron/src/Makefile.am index 7e5d47eee2..f508440f60 100644 --- a/c/src/exec/itron/src/Makefile.am +++ b/c/src/exec/itron/src/Makefile.am @@ -43,7 +43,6 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \ $(TIME_C_FILES) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) -SRCS = $(C_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/exec/libcsupport/src/Makefile.am b/c/src/exec/libcsupport/src/Makefile.am index 6e3c57b4f9..20893f29eb 100644 --- a/c/src/exec/libcsupport/src/Makefile.am +++ b/c/src/exec/libcsupport/src/Makefile.am @@ -98,7 +98,6 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h TMPINSTALL_FILES += \ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a -SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) OBJS = $(C_O_FILES) # @@ -117,7 +116,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) DOC_FILES = TODO CASES -## This only works with automake > 1.14 EXTRA_DIST = \ $(DOC_FILES) \ $(COMMON_C_FILES) $(EMBEDDED_C_FILES) $(UNIX_C_FILES) \ diff --git a/c/src/exec/posix/configure.in b/c/src/exec/posix/configure.in index a34410a8ad..ed398e3b53 100644 --- a/c/src/exec/posix/configure.in +++ b/c/src/exec/posix/configure.in @@ -23,10 +23,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -## FIXME: needed for INSTALL_CHANGE in autoconf subdirectories -RTEMS_PATH_KSH - -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -66,7 +62,7 @@ fi ## ## FIXME: We configure and build the macros subdirectory, too. ## Should probably use AM_CONDITIONALs to disable them in future -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile src/Makefile diff --git a/c/src/exec/posix/src/Makefile.am b/c/src/exec/posix/src/Makefile.am index 9f00dce8a5..63fd5adc0f 100644 --- a/c/src/exec/posix/src/Makefile.am +++ b/c/src/exec/posix/src/Makefile.am @@ -81,7 +81,6 @@ C_FILES = adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \ $(BUILD_FOR_NOW_C_FILES) utsname.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) -SRCS = $(C_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -94,7 +93,7 @@ include $(top_srcdir)/../../../../automake/lib.am AM_CPPFLAGS += -D__RTEMS_INSIDE__ AM_CFLAGS += $(CFLAGS_OS_V) -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} ${OBJS} # temporary so we can see how many things are left to implement not: diff --git a/c/src/exec/rtems/src/Makefile.am b/c/src/exec/rtems/src/Makefile.am index ddf816a050..16d932dc9d 100644 --- a/c/src/exec/rtems/src/Makefile.am +++ b/c/src/exec/rtems/src/Makefile.am @@ -63,7 +63,6 @@ endif C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) -SRCS = $(C_FILES) OBJS = $(C_O_FILES) # @@ -73,7 +72,7 @@ OBJS = $(C_O_FILES) AM_CPPFLAGS += -D__RTEMS_INSIDE__ AM_CFLAGS += $(CFLAGS_OS_V) -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} ${OBJS} EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) diff --git a/c/src/exec/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am index d4c32b0ee7..91d461279c 100644 --- a/c/src/exec/sapi/src/Makefile.am +++ b/c/src/exec/sapi/src/Makefile.am @@ -8,7 +8,6 @@ C_FILES = debug.c entrytable.c extension.c fatal.c exinit.c io.c itronapi.c \ posixapi.c rtemsapi.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) -SRCS = $(C_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/exec/score/cpu/a29k/configure.in b/c/src/exec/score/cpu/a29k/configure.in index f3af0586e4..da5ac59c80 100644 --- a/c/src/exec/score/cpu/a29k/configure.in +++ b/c/src/exec/score/cpu/a29k/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-a29k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/hppa1.1/configure.in b/c/src/exec/score/cpu/hppa1.1/configure.in index 9a06a53e26..04d7c085b5 100644 --- a/c/src/exec/score/cpu/hppa1.1/configure.in +++ b/c/src/exec/score/cpu/hppa1.1/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-hppa1.1,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/i386/configure.in b/c/src/exec/score/cpu/i386/configure.in index bb3809856b..5b50199cfc 100644 --- a/c/src/exec/score/cpu/i386/configure.in +++ b/c/src/exec/score/cpu/i386/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i386,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/i960/configure.in b/c/src/exec/score/cpu/i960/configure.in index 7ce69f661f..ee5027626b 100644 --- a/c/src/exec/score/cpu/i960/configure.in +++ b/c/src/exec/score/cpu/i960/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i960,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/m68k/configure.in b/c/src/exec/score/cpu/m68k/configure.in index 0d3dbe618f..3a80e45eda 100644 --- a/c/src/exec/score/cpu/m68k/configure.in +++ b/c/src/exec/score/cpu/m68k/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-m68k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/mips/configure.in b/c/src/exec/score/cpu/mips/configure.in index ee34a0c8e1..edf945294b 100644 --- a/c/src/exec/score/cpu/mips/configure.in +++ b/c/src/exec/score/cpu/mips/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/mips64orion/configure.in b/c/src/exec/score/cpu/mips64orion/configure.in index ee34a0c8e1..edf945294b 100644 --- a/c/src/exec/score/cpu/mips64orion/configure.in +++ b/c/src/exec/score/cpu/mips64orion/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/no_cpu/configure.in b/c/src/exec/score/cpu/no_cpu/configure.in index 772bc9fb25..7a8cc99b1b 100644 --- a/c/src/exec/score/cpu/no_cpu/configure.in +++ b/c/src/exec/score/cpu/no_cpu/configure.in @@ -9,11 +9,9 @@ AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sparc,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-no_cpu,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/powerpc/configure.in b/c/src/exec/score/cpu/powerpc/configure.in index 665fe5997f..333acdaf5b 100644 --- a/c/src/exec/score/cpu/powerpc/configure.in +++ b/c/src/exec/score/cpu/powerpc/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-powerpc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -33,7 +30,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604") -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile shared/Makefile diff --git a/c/src/exec/score/cpu/sh/configure.in b/c/src/exec/score/cpu/sh/configure.in index 2b9e709f1e..0a52a3f98f 100644 --- a/c/src/exec/score/cpu/sh/configure.in +++ b/c/src/exec/score/cpu/sh/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sh,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -31,7 +28,7 @@ RTEMS_CHECK_NEWLIB RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/sparc/configure.in b/c/src/exec/score/cpu/sparc/configure.in index f155436c69..be419fc020 100644 --- a/c/src/exec/score/cpu/sparc/configure.in +++ b/c/src/exec/score/cpu/sparc/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sparc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/cpu/unix/configure.in b/c/src/exec/score/cpu/unix/configure.in index bce3a818b3..d7fbb84b05 100644 --- a/c/src/exec/score/cpu/unix/configure.in +++ b/c/src/exec/score/cpu/unix/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-unix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP @@ -22,7 +21,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -37,7 +35,7 @@ if test "$HAS_MP" = "yes"; then RTEMS_CHECK_SYSV_UNIX fi -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile rtems/Makefile diff --git a/c/src/exec/score/src/Makefile.am b/c/src/exec/score/src/Makefile.am index facf739415..f5914fdb37 100644 --- a/c/src/exec/score/src/Makefile.am +++ b/c/src/exec/score/src/Makefile.am @@ -64,7 +64,6 @@ C_FILES = $(STD_C_FILES) endif C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) -SRCS = $(C_FILES) OBJS = $(C_O_FILES) # diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in index f659403060..3b6ebdd372 100644 --- a/c/src/lib/configure.in +++ b/c/src/lib/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENABLE_HWAPI @@ -24,7 +23,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -51,7 +49,7 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_SUBDIRS($cfg_subdirs) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile 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 diff --git a/c/src/lib/libc/Makefile.am b/c/src/lib/libc/Makefile.am index 6e3c57b4f9..20893f29eb 100644 --- a/c/src/lib/libc/Makefile.am +++ b/c/src/lib/libc/Makefile.am @@ -98,7 +98,6 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h TMPINSTALL_FILES += \ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a -SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) OBJS = $(C_O_FILES) # @@ -117,7 +116,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) DOC_FILES = TODO CASES -## This only works with automake > 1.14 EXTRA_DIST = \ $(DOC_FILES) \ $(COMMON_C_FILES) $(EMBEDDED_C_FILES) $(UNIX_C_FILES) \ diff --git a/c/src/lib/libcpu/a29k/clock/Makefile.am b/c/src/lib/libcpu/a29k/clock/Makefile.am index 12eab07673..00fc4bc7b8 100644 --- a/c/src/lib/libcpu/a29k/clock/Makefile.am +++ b/c/src/lib/libcpu/a29k/clock/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): $(SRCS) $(OBJS) +$(PGM): $(OBJS) $(make-rel) all-local: $(ARCH) $(OBJS) $(PGM) diff --git a/c/src/lib/libcpu/a29k/configure.in b/c/src/lib/libcpu/a29k/configure.in index dabe68edb9..2b94c80000 100644 --- a/c/src/lib/libcpu/a29k/configure.in +++ b/c/src/lib/libcpu/a29k/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-a29k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am index f17c802679..c87e702427 100644 --- a/c/src/lib/libcpu/a29k/timer/Makefile.am +++ b/c/src/lib/libcpu/a29k/timer/Makefile.am @@ -20,13 +20,13 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): $(SRCS) $(OBJS) +$(PGM): $(OBJS) $(make-rel) all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = Makefile gettime.S timer.c timerisr.c +EXTRA_DIST = Makefile timer.c timerisr.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/configure.in b/c/src/lib/libcpu/configure.in index 715e517fe3..45d8af87c1 100644 --- a/c/src/lib/libcpu/configure.in +++ b/c/src/lib/libcpu/configure.in @@ -22,5 +22,6 @@ AC_SUBST(RTEMS_CPU_SUBDIR) AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libcpu/hppa1.1/configure.in b/c/src/lib/libcpu/hppa1.1/configure.in index d2c063b129..8459da6532 100644 --- a/c/src/lib/libcpu/hppa1.1/configure.in +++ b/c/src/lib/libcpu/hppa1.1/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-hppa1.1,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/i386/configure.in b/c/src/lib/libcpu/i386/configure.in index d01bc4a79a..b36f7e88f8 100644 --- a/c/src/lib/libcpu/i386/configure.in +++ b/c/src/lib/libcpu/i386/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-i386,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libcpu/m68k/configure.in b/c/src/lib/libcpu/m68k/configure.in index 7c54838139..efcd7c5b7e 100644 --- a/c/src/lib/libcpu/m68k/configure.in +++ b/c/src/lib/libcpu/m68k/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-m68k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +20,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -31,6 +28,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) AM_CONDITIONAL(m68040, test "$RTEMS_CPU_MODEL" = "m68040") +# Explicitly list all Makefiles here AC_OUTPUT( Makefile m68040/Makefile diff --git a/c/src/lib/libcpu/mips/configure.in b/c/src/lib/libcpu/mips/configure.in index c131f723ba..aed970845c 100644 --- a/c/src/lib/libcpu/mips/configure.in +++ b/c/src/lib/libcpu/mips/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/mips64orion/configure.in b/c/src/lib/libcpu/mips64orion/configure.in index c131f723ba..aed970845c 100644 --- a/c/src/lib/libcpu/mips64orion/configure.in +++ b/c/src/lib/libcpu/mips64orion/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/powerpc/configure.in b/c/src/lib/libcpu/powerpc/configure.in index 4f7be603d9..dfeed3d186 100644 --- a/c/src/lib/libcpu/powerpc/configure.in +++ b/c/src/lib/libcpu/powerpc/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-powerpc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +20,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -41,6 +38,7 @@ AM_CONDITIONAL(mpc821, test "$RTEMS_CPU_MODEL" = "mpc821") AM_CONDITIONAL(mpc860, test "$RTEMS_CPU_MODEL" = "mpc860") AM_CONDITIONAL(ppc403, test "$RTEMS_CPU_MODEL" = "ppc403") +# Explicitly list all Makefiles here AC_OUTPUT( Makefile mpc505/Makefile diff --git a/c/src/lib/libcpu/sh/configure.in b/c/src/lib/libcpu/sh/configure.in index 09eb21adb0..fbf6fbca9e 100644 --- a/c/src/lib/libcpu/sh/configure.in +++ b/c/src/lib/libcpu/sh/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-sh,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile sh7032/Makefile diff --git a/c/src/lib/libcpu/sparc/configure.in b/c/src/lib/libcpu/sparc/configure.in index ce3265ff61..2cf51d9401 100644 --- a/c/src/lib/libcpu/sparc/configure.in +++ b/c/src/lib/libcpu/sparc/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-sparc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ 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_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile reg_win/Makefile diff --git a/c/src/libchip/configure.in b/c/src/libchip/configure.in index e7d2d5a9be..ebe580d377 100644 --- a/c/src/libchip/configure.in +++ b/c/src/libchip/configure.in @@ -12,7 +12,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-libchip,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +21,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -37,7 +35,7 @@ fi AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes") -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile network/Makefile diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am index 77d262a170..55962bdffe 100644 --- a/c/src/libchip/network/Makefile.am +++ b/c/src/libchip/network/Makefile.am @@ -1,23 +1,21 @@ -# -# $Id$ -# +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libnetchip -LIB = ${ARCH}/${LIBNAME}.a +LIB = $(ARCH)/$(LIBNAME).a C_FILES = dec21140.c sonic.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = sonic.h -noinst_HEADERS = $(H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/libchip: @$(mkinstalldirs) $@ @@ -28,29 +26,28 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h # Add local stuff here using += # -AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -AM_CFLAGS += $(LIBC_DEFINES) - -if HAS_NETWORKING - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/libchip \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) - -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +AM_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +AM_CFLAGS = $(LIBC_DEFINES) -$(LIB): ${OBJS} +$(LIB): $(OBJS) $(make-library) $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +if HAS_NETWORKING +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ + $(PROJECT_INCLUDE)/libchip/sonic.h +endif + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +if HAS_NETWORKING +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES) endif -EXTRA_DIST = README README.sonic -EXTRA_DIST += $(C_FILES) +.PRECIOUS: $(LIB) + +EXTRA_DIST = README README.dec21140 README.sonic dec21140.c sonic.c sonic.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am index 79b73b60af..c2ec59470d 100644 --- a/c/src/libchip/rtc/Makefile.am +++ b/c/src/libchip/rtc/Makefile.am @@ -15,7 +15,6 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = rtc.h icm7170.h m48t08.h noinst_HEADERS = $(H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -50,6 +49,6 @@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) DOC_FILES = \ README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS -EXTRA_DIST += $(C_FILES) $(DOC_FILES) +EXTRA_DIST = $(C_FILES) $(DOC_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am index 6e70ca107c..3e860df828 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -16,7 +16,6 @@ H_FILES = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h INSTALLED_H_FILES = mc68681.h ns16550.h z85c30.h serial.h noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -51,6 +50,6 @@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) DOC_FILES = \ README.mc68681 README.ns16550 README.xr88681 README.z85c30 STATUS -EXTRA_DIST += $(C_FILES) $(DOC_FILES) +EXTRA_DIST = $(C_FILES) $(DOC_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in index a1c35f5536..ef027f5574 100644 --- a/c/src/libmisc/configure.in +++ b/c/src/libmisc/configure.in @@ -13,7 +13,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -23,7 +22,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -32,7 +30,7 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -# Try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile cpuuse/Makefile diff --git a/c/src/libmisc/cpuuse/Makefile.am b/c/src/libmisc/cpuuse/Makefile.am index d3bd220f54..542eae4bab 100644 --- a/c/src/libmisc/cpuuse/Makefile.am +++ b/c/src/libmisc/cpuuse/Makefile.am @@ -1,27 +1,21 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libcpuuse-tmp -LIB = ${ARCH}/${LIBNAME}.a +LIB = $(ARCH)/$(LIBNAME).a C_FILES = cpuuse.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = cpuuse.h -noinst_HEADERS = $(H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -32,11 +26,16 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h # (OPTIONAL) Add local stuff here using += # -${LIB}: ${OBJS} +$(LIB): $(OBJS) $(make-library) -all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) -EXTRA_DIST += $(C_FILES) +EXTRA_DIST = README cpuuse.c cpuuse.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libmisc/monitor/Makefile.am b/c/src/libmisc/monitor/Makefile.am index fa9f98db9d..2c8db51ffa 100644 --- a/c/src/libmisc/monitor/Makefile.am +++ b/c/src/libmisc/monitor/Makefile.am @@ -1,11 +1,11 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libmonitor-tmp -LIB = ${ARCH}/$(LIBNAME).a +LIB = $(ARCH)/$(LIBNAME).a # We only build multiprocessing related files if HAS_MP was defined MP_C_FILES = mon-mpci.c @@ -15,23 +15,17 @@ C_FILES = mon-command.c mon-symbols.c mon-prmisc.c mon-monitor.c \ mon-dname.c mon-itask.c mon-extension.c mon-manager.c mon-config.c if HAS_MP -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) $(MP_C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) $(MP_C_FILES:%.c=$(ARCH)/%.o) else -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) endif H_FILES = monitor.h symbols.h -noinst_HEADERS = $(H_FILES) -SRCS = README $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/rtems: $(mkinstalldirs) $@ @@ -42,11 +36,19 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h # (OPTIONAL) Add local stuff here using += # -${LIB}: ${OBJS} +$(LIB): $(OBJS) $(make-library) -all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) -EXTRA_DIST += $(C_FILES) $(MP_C_FILES) +EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \ + mon-extension.c mon-itask.c mon-manager.c mon-monitor.c mon-mpci.c \ + mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \ + mon-task.c monitor.h symbols.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libmisc/rtmonuse/Makefile.am b/c/src/libmisc/rtmonuse/Makefile.am index e701353a1f..76f7f19acd 100644 --- a/c/src/libmisc/rtmonuse/Makefile.am +++ b/c/src/libmisc/rtmonuse/Makefile.am @@ -1,27 +1,21 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = librtmonuse-tmp -LIB = ${ARCH}/${LIBNAME}.a +LIB = $(ARCH)/$(LIBNAME).a C_FILES = rtmonuse.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = rtmonuse.h -noinst_HEADERS = $(H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -32,11 +26,16 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h # (OPTIONAL) Add local stuff here using += # -${LIB}: ${OBJS} +$(LIB): $(OBJS) $(make-library) -all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) -EXTRA_DIST += $(C_FILES) +EXTRA_DIST = rtmonuse.c rtmonuse.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libmisc/stackchk/Makefile.am b/c/src/libmisc/stackchk/Makefile.am index e5f467c42a..83dd699c85 100644 --- a/c/src/libmisc/stackchk/Makefile.am +++ b/c/src/libmisc/stackchk/Makefile.am @@ -1,28 +1,22 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libstackchk-tmp -LIB = ${ARCH}/${LIBNAME}.a +LIB = $(ARCH)/$(LIBNAME).a C_FILES = check.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = internal.h INSTALLED_H_FILES = stackchk.h -noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES) -SRCS = $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -33,11 +27,16 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h # (OPTIONAL) Add local stuff here using += # -${LIB}: ${OBJS} +$(LIB): $(OBJS) $(make-library) -all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) -EXTRA_DIST += $(C_FILES) +EXTRA_DIST = README check.c internal.h stackchk.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libmisc/untar/Makefile.am b/c/src/libmisc/untar/Makefile.am index 33badae971..6bb36617a3 100644 --- a/c/src/libmisc/untar/Makefile.am +++ b/c/src/libmisc/untar/Makefile.am @@ -1,27 +1,21 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libuntar-tmp -LIB = ${ARCH}/${LIBNAME}.a +LIB = $(ARCH)/$(LIBNAME).a C_FILES = untar.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = untar.h -noinst_HEADERS = $(H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -32,11 +26,16 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h # (OPTIONAL) Add local stuff here using += # -${LIB}: ${OBJS} +$(LIB): $(OBJS) $(make-library) -all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) -EXTRA_DIST += $(C_FILES) +EXTRA_DIST = README untar.c untar.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am index d5021a7be0..5d43b326b3 100644 --- a/c/src/libmisc/wrapup/Makefile.am +++ b/c/src/libmisc/wrapup/Makefile.am @@ -1,23 +1,20 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libmisc -LIB = ${ARCH}/$(LIBNAME).a +LIB = $(ARCH)/$(LIBNAME).a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/lib.am -TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \ - ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \ - ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \ +TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \ + ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \ + ../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \ ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ @@ -29,12 +26,14 @@ $(LIB): $(TMP_LIBS) $(RM) $@ $(RM) -r $(ARCH) mkdir $(ARCH) - cd $(ARCH); for lib in $^; do \ - $(AR) -xv ../$$lib; \ - done + cd $(ARCH); for lib in $^; do $(AR) -xv ../$$lib; done $(AR) ruv $@ $(ARCH)/* $(RANLIB) $@ -all: ${ARCH} $(LIB) $(TMPINSTALL_FILES) +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a + +all-local: $(ARCH) $(LIB) $(TMPINSTALL_FILES) + +.PRECIOUS: $(LIB) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libnetworking/configure.in b/c/src/libnetworking/configure.in index 7bf62bb1ee..e6d3d60d33 100644 --- a/c/src/libnetworking/configure.in +++ b/c/src/libnetworking/configure.in @@ -9,11 +9,10 @@ AC_CONFIG_AUX_DIR(../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-lib-libnetworking,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-libnetworking,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENABLE_POSIX @@ -24,7 +23,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -34,7 +32,7 @@ RTEMS_CHECK_POSIX_API(RTEMS_BSP) AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") -# try to explicitly list a Makefile here +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile diff --git a/c/src/librdbg/configure.in b/c/src/librdbg/configure.in index 8711f6ba59..e531a01440 100644 --- a/c/src/librdbg/configure.in +++ b/c/src/librdbg/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_RDBG -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +21,6 @@ RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -49,7 +47,7 @@ AM_CONDITIONAL(HAS_RDBG,test "$HAS_RDBG" = "yes") 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/librdbg/include/Makefile.am b/c/src/librdbg/include/Makefile.am index 1f56857d20..03d6d96407 100644 --- a/c/src/librdbg/include/Makefile.am +++ b/c/src/librdbg/include/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = rdbg diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am index 1b0435f479..3e41bfc8ad 100644 --- a/c/src/librdbg/src/Makefile.am +++ b/c/src/librdbg/src/Makefile.am @@ -1,25 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = $(RTEMS_CPU) -EXTRA_DIST = \ -_servtgt.c \ -awk.svc \ -excep.c \ -ptrace.c \ -rdbg.c \ -remdeb.x \ -servbkpt.c \ -servcon.c \ -servrpc.c \ -servtgt.c \ -servtsp.c \ -servutil.c +EXTRA_DIST = _servtgt.c awk.svc excep.c ptrace.c rdbg.c remdeb.x servbkpt.c \ + servcon.c servrpc.c servtgt.c servtsp.c servutil.c include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am index 80b46a330e..9fec02b48f 100644 --- a/c/src/librdbg/src/i386/Makefile.am +++ b/c/src/librdbg/src/i386/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = any diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am index 14f0f46763..006c0d9867 100644 --- a/c/src/librdbg/src/powerpc/Makefile.am +++ b/c/src/librdbg/src/powerpc/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = mcp750 diff --git a/c/src/librpc/configure.in b/c/src/librpc/configure.in index 4b5ac39717..949bcc43c8 100644 --- a/c/src/librpc/configure.in +++ b/c/src/librpc/configure.in @@ -14,14 +14,12 @@ AM_INIT_AUTOMAKE(rtems-c-src-librpc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -31,7 +29,7 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") 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/librtems++/configure.in b/c/src/librtems++/configure.in index 6662241950..3f69709b9c 100644 --- a/c/src/librtems++/configure.in +++ b/c/src/librtems++/configure.in @@ -14,7 +14,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-librtems++,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_CXX -RTEMS_ENABLE_LIBCDIR RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU @@ -31,6 +30,7 @@ AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") RTEMS_PROJECT_ROOT +# Explicitly list all Makefiles here AC_OUTPUT( Makefile include/Makefile diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index 653f93ed0d..88b5e58c0d 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/c/src/make/compilers/gcc-target-default.cfg @@ -162,25 +162,9 @@ CPP=$(CC) -E -ansi -w -Wp,-$$ AR_SYMBOL_TABLE="HIGHLY-UNLIKELY-TO-CONFLICT" ARFLAGS=ruv -# -# Command to convert a normal archive to one searchable by $(LD) -# -# NOTE: Obsolete, use $(RANLIB) instead, MKLIB may disappear soon -MKLIB=$(RANLIB) - - # # How to compile stuff into ${ARCH} subdirectory # -# OBSOLETE: we use make's default rules now -# -# NOTE: we override COMPILE.[c|cc|S] -# because gmake default rules use TARGET_ARCH for different purposes -# -# -# COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c -# COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -# COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c ${ARCH}/%.o: %.c ${COMPILE.c} $(AM_CPPFLAGS) $(AM_CFLAGS) -o $@ $< diff --git a/c/src/make/configure.in b/c/src/make/configure.in index 24068a65bf..a73b18dd0c 100644 --- a/c/src/make/configure.in +++ b/c/src/make/configure.in @@ -24,7 +24,6 @@ RTEMS_ENABLE_RDBG RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -56,7 +55,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET dnl check for g++ @@ -120,6 +118,7 @@ AC_LINK_FILES($cfg_dir/leaf.cfg,leaf.cfg) AC_LINK_FILES($cfg_dir/lib.cfg,lib.cfg) AC_LINK_FILES($cfg_dir/README,README) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile Makefile.inc diff --git a/c/src/make/lib.cfg b/c/src/make/lib.cfg index 5c35c6236a..88ba811e9a 100644 --- a/c/src/make/lib.cfg +++ b/c/src/make/lib.cfg @@ -12,7 +12,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg define make-library $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) -$(MKLIB) $@ +$(RANLIB) $@ endef .PRECIOUS: $(LIB) 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