diff options
| -rw-r--r-- | testsuites/samples/ChangeLog | 6 | ||||
| -rw-r--r-- | testsuites/samples/configure.ac | 7 | ||||
| -rw-r--r-- | testsuites/samples/fileio/Makefile.am | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index 42c574e915..eb81fb9f7e 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,3 +1,9 @@ +2010-08-16 Ralf Corsépius <ralf.corsepius@rtems.org> + + * fileio/Makefile.am: Remove AM_CONDITIONAL(LIBCHIP). + * configure.ac: Remove AM_CONDITIONAL(LIBCHIP). + Force autoconf-2.67, automake-1.11.1. + 2010-07-07 Sebastian Huber <Sebastian.Huber@embedded-brains.de> * minimum/init.c: Use fatal error extension to prevent infinite diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac index 3e7636b37e..98ba278280 100644 --- a/testsuites/samples/configure.ac +++ b/testsuites/samples/configure.ac @@ -2,14 +2,14 @@ ## ## $Id$ -AC_PREREQ(2.60) +AC_PREREQ(2.67) AC_INIT([rtems-c-src-tests-samples],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([hello]) RTEMS_TOP([../..],[..]) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.10]) +AM_INIT_AUTOMAKE([no-define foreign 1.11.1]) AM_MAINTAINER_MODE RTEMS_ENABLE_CXX @@ -55,9 +55,6 @@ AM_CONDITIONAL([CXXTESTS],[test $CXXTESTS = "yes"]) AM_CONDITIONAL(NETTESTS,test "$rtems_cv_RTEMS_NETWORKING" = "yes") AM_CONDITIONAL(MPTESTS,test "$rtems_cv_RTEMS_MULTIPROCESSING" = "yes") -#FIXME: We should use a feature based check -AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile base_sp/Makefile diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am index e6cae04b6a..5e3088bbbe 100644 --- a/testsuites/samples/fileio/Makefile.am +++ b/testsuites/samples/fileio/Makefile.am @@ -4,19 +4,15 @@ MANAGERS = io message semaphore -if LIBCHIP - rtems_tests_PROGRAMS = fileio fileio_SOURCES = init.c system.h dist_rtems_tests_DATA = fileio.doc -endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -if LIBCHIP fileio_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) LINK_OBJS = $(fileio_OBJECTS) $(fileio_LDADD) @@ -25,6 +21,5 @@ LINK_LIBS = $(fileio_LDLIBS) fileio$(EXEEXT): $(fileio_OBJECTS) $(fileio_DEPENDENCIES) @rm -f fileio$(EXEEXT) $(make-exe) -endif include $(top_srcdir)/../automake/local.am |