From d04956892ad514d1e514c99c79afddadf6a9511d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 6 Jan 2002 20:11:49 +0000 Subject: 2002-02-05 Ralf Corsepius * Makefile.am: Remove make from SUBDIRS. * configure.ac: Remove make from CONFIG_SUBDIRS, cosmetics. --- c/ChangeLog | 5 +++++ c/Makefile.am | 2 +- c/configure.ac | 10 +++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/c/ChangeLog b/c/ChangeLog index 1b0186e26a..f18b7bccb8 100644 --- a/c/ChangeLog +++ b/c/ChangeLog @@ -1,3 +1,8 @@ +2002-02-05 Ralf Corsepius + + * Makefile.am: Remove make from SUBDIRS. + * configure.ac: Remove make from CONFIG_SUBDIRS, cosmetics. + 2001-10-11 Ralf Corsepius * .cvsignore: Add autom4te.cache for autoconf > 2.52. diff --git a/c/Makefile.am b/c/Makefile.am index 92d6445711..17d0f45bbf 100644 --- a/c/Makefile.am +++ b/c/Makefile.am @@ -12,7 +12,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal RTEMS_BSP = $(RTEMS_BSP_LIST) ## The '.' in SUBDIRS ensures that local make-targets (xxx-am) will be ## triggered before $(RTEMS_BSP_LIST) subdirectories are made. -SUBDIRS = make . $(RTEMS_BSP) +SUBDIRS = . $(RTEMS_BSP) ## Use @RTEMS_BSP_LIST@ here, using $(RTEMS_BSP_LIST) would trigger ## this rule for invalid BSPs diff --git a/c/configure.ac b/c/configure.ac index e6a3171a8e..8d5374323f 100644 --- a/c/configure.ac +++ b/c/configure.ac @@ -20,9 +20,8 @@ RTEMS_ENABLE_RTEMSBSP(rtems_bsp) RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST -if test -z "$rtems_bsp"; then - RTEMS_CHECK_BSPS(rtems_bsp) -fi +AS_IF([test -z "$rtems_bsp"], + [RTEMS_CHECK_BSPS(rtems_bsp)]) for i in $rtems_bsp; do @@ -91,11 +90,8 @@ AC_SUBST(rtems_bsp_configure) AC_SUBST(RTEMS_BSP_LIST) -AC_CONFIG_SUBDIRS(make) - # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT echo -- cgit v1.2.3