From 06908af6b0ad36fb533ef8c6af48cd1011582412 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 4 Feb 2003 01:16:14 +0000 Subject: 2003-02-03 Ralf Corsepius * configure.ac: Unconditionally check for CXX. Require autoconf-2.57, automake-1.7.2. * rtems++: Eliminate CC_O_FILES. --- c/src/tests/libtests/ChangeLog | 6 ++++++ c/src/tests/libtests/configure.ac | 8 +++----- c/src/tests/libtests/rtems++/Makefile.am | 3 +-- testsuites/libtests/ChangeLog | 6 ++++++ testsuites/libtests/configure.ac | 8 +++----- testsuites/libtests/rtems++/Makefile.am | 3 +-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/c/src/tests/libtests/ChangeLog b/c/src/tests/libtests/ChangeLog index c1d0951435..ba72a4d087 100644 --- a/c/src/tests/libtests/ChangeLog +++ b/c/src/tests/libtests/ChangeLog @@ -1,3 +1,9 @@ +2003-02-03 Ralf Corsepius + + * configure.ac: Unconditionally check for CXX. + Require autoconf-2.57, automake-1.7.2. + * rtems++: Eliminate CC_O_FILES. + 2002-12-02 Joel Sherrill * malloctest/init.c: Tasks should be floating point. diff --git a/c/src/tests/libtests/configure.ac b/c/src/tests/libtests/configure.ac index 404a193cdd..712b0b05ad 100644 --- a/c/src/tests/libtests/configure.ac +++ b/c/src/tests/libtests/configure.ac @@ -2,7 +2,7 @@ ## ## $Id$ -AC_PREREQ(2.52) +AC_PREREQ(2.57) AC_INIT([rtems-c-src-tests-libtests],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpuuse]) RTEMS_TOP(../../../..) @@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.6]) +AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_CXX @@ -25,9 +25,7 @@ RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) -if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then - RTEMS_PROG_CXX_FOR_TARGET -fi +RTEMS_PROG_CXX_FOR_TARGET RTEMS_CANONICALIZE_TOOLS diff --git a/c/src/tests/libtests/rtems++/Makefile.am b/c/src/tests/libtests/rtems++/Makefile.am index e7dd1e5785..abddb9ee00 100644 --- a/c/src/tests/libtests/rtems++/Makefile.am +++ b/c/src/tests/libtests/rtems++/Makefile.am @@ -8,7 +8,7 @@ TEST = rtems++ MANAGERS = event io msg sem signal timer rate_monotonic CC_FILES = Init.cc Task1.cc Task2.cc Task3.cc -CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) +OBJS = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) H_FILES = System.h noinst_HEADERS = $(H_FILES) @@ -17,7 +17,6 @@ DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(CC_O_FILES) PRINT_SRCS = $(DOCS) diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index c1d0951435..ba72a4d087 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,9 @@ +2003-02-03 Ralf Corsepius + + * configure.ac: Unconditionally check for CXX. + Require autoconf-2.57, automake-1.7.2. + * rtems++: Eliminate CC_O_FILES. + 2002-12-02 Joel Sherrill * malloctest/init.c: Tasks should be floating point. diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index 404a193cdd..712b0b05ad 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -2,7 +2,7 @@ ## ## $Id$ -AC_PREREQ(2.52) +AC_PREREQ(2.57) AC_INIT([rtems-c-src-tests-libtests],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpuuse]) RTEMS_TOP(../../../..) @@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.6]) +AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_CXX @@ -25,9 +25,7 @@ RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) -if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then - RTEMS_PROG_CXX_FOR_TARGET -fi +RTEMS_PROG_CXX_FOR_TARGET RTEMS_CANONICALIZE_TOOLS diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am index e7dd1e5785..abddb9ee00 100644 --- a/testsuites/libtests/rtems++/Makefile.am +++ b/testsuites/libtests/rtems++/Makefile.am @@ -8,7 +8,7 @@ TEST = rtems++ MANAGERS = event io msg sem signal timer rate_monotonic CC_FILES = Init.cc Task1.cc Task2.cc Task3.cc -CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) +OBJS = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) H_FILES = System.h noinst_HEADERS = $(H_FILES) @@ -17,7 +17,6 @@ DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(CC_O_FILES) PRINT_SRCS = $(DOCS) -- cgit v1.2.3