diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-17 13:44:16 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-17 13:44:16 +0000 |
| commit | 1204f225cba8b68baceaca645e338853dc0a8fba (patch) | |
| tree | a2c88b0a7704b796ad1dadd6bfa5e733fc02671a /c | |
| parent | 2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-1204f225cba8b68baceaca645e338853dc0a8fba.tar.bz2 | |
2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Cosmetics.
* configure.ac: Add support for --disable-rtemsbsp. Cosmetics.
Diffstat (limited to 'c')
| -rw-r--r-- | c/ChangeLog | 5 | ||||
| -rw-r--r-- | c/Makefile.am | 3 | ||||
| -rw-r--r-- | c/configure.ac | 15 |
3 files changed, 16 insertions, 7 deletions
diff --git a/c/ChangeLog b/c/ChangeLog index 4644b958cb..1c64e2bf12 100644 --- a/c/ChangeLog +++ b/c/ChangeLog @@ -1,3 +1,8 @@ +2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Cosmetics. + * configure.ac: Add support for --disable-rtemsbsp. Cosmetics. + 2004-01-07 Joel Sherrill <joel@OARcorp.com> * ACKNOWLEDGEMENTS: Remove efi68k and efi332 references as they are no diff --git a/c/Makefile.am b/c/Makefile.am index ac5c94191c..4298924e66 100644 --- a/c/Makefile.am +++ b/c/Makefile.am @@ -12,6 +12,7 @@ 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 = . $(RTEMS_BSP) +DIST_SUBDIRS = $(RTEMS_BSP) ## Let all RTEMS' make targets depend on ${RTEMS_BSP} all-local: ${RTEMS_BSP} @@ -22,7 +23,5 @@ depend-am: ${RTEMS_BSP} EXTRA_DIST = ACKNOWLEDGEMENTS EXTRA_DIST += TOOL_TARGETS -DIST_SUBDIRS = ${RTEMS_BSP} - include $(top_srcdir)/../automake/host.am include $(top_srcdir)/../automake/subdirs.am diff --git a/c/configure.ac b/c/configure.ac index 2a6bf267da..9f02f37098 100644 --- a/c/configure.ac +++ b/c/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.59) AC_INIT([rtems-c],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) -AC_CONFIG_SRCDIR([src]) +AC_CONFIG_SRCDIR([TOOL_TARGETS]) RTEMS_TOP(..) RTEMS_CANONICAL_TARGET_CPU @@ -14,12 +14,16 @@ AM_MAINTAINER_MODE ## These options are used within this file. RTEMS_ENABLE_BARE -RTEMS_ENABLE_RTEMSBSP(rtems_bsp) +RTEMS_ENABLE_RTEMSBSP RTEMS_CHECK_CPU -AS_IF([test -z "$rtems_bsp"], - [RTEMS_CHECK_BSPS(rtems_bsp)]) +AS_IF([test x"$enable_rtemsbsp" = x"no"],[ + rtems_bsp="" +],[ + AS_IF([test -z "$enable_rtemsbsp"], + [RTEMS_CHECK_BSPS(rtems_bsp)], + [rtems_bsp="$enable_rtemsbsp"]) for i in $rtems_bsp; do @@ -45,11 +49,12 @@ for i in $rtems_bsp; do AC_MSG_ERROR([unable to find libbsp directory ($bspdir) for $i]) fi done +]) # # Compose the configuration arguments to be passed to c/src/configure # - ## +## ## Partially borrowed from autoconf-2.13 ## |