diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-04-12 15:41:33 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-04-12 15:41:33 +0000 |
| commit | 8cdb582b49c1528216cfd316183536735474c899 (patch) | |
| tree | 88c7168b08ee935044266ff9a4c3b4b6d060d517 /configure.in | |
| parent | Added line to initialize timer_max. (diff) | |
| download | rtems-8cdb582b49c1528216cfd316183536735474c899.tar.bz2 | |
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
This patch addresses a few minor issues and contains a few (minor)
preparations for automake.
* configure.in: Fix for handing c/src/tests subdirectory handling (FIX)
* aclocal/rtems-top.m4:
+ Add TARGET_SUBDIR and --with-target-subdir (preparation of future
enhancements for cross-compiling)
+ Activate RTEMS_ROOT handling (automake preparation)
* automake/*.am: replace comments "#" with "##" so that comments won't
get included into Makefile.in's anymore
* c/update-tools/* automake support (NEW)
* ./autogen update/enhancement (cf. ./autogen for details)
After applying this patch please run:
./autogen
cvs add c/update-tools/configure.in
cvs add c/update-tools/Makefile.am
cvs add c/update-tools/aclocal.m4
Diffstat (limited to '')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 04f9ea2994..47d2a21617 100644 --- a/configure.in +++ b/configure.in @@ -78,8 +78,6 @@ dnl imply all BSPs. Eventually we would like to build a collection dnl of CPU model specific RTEMS libraries which in conjunction with dnl a BSP library would be used to link an application. -RTEMS_HOST=$host_os - RTEMS_CANONICAL_TARGET_CPU RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST @@ -335,8 +333,8 @@ fi RTEMS_ENABLE_TESTS -RTEMS_CHECK_MAKEFILE(c/src/tests/tools/$target_cpu) - +# always build the test tools +testtools_cfgdirs="c/src/tests/tools/generic" if test "$tests_enabled" = "yes"; then RTEMS_CHECK_MAKEFILE(c/src/tests/libtests) RTEMS_CHECK_MAKEFILE(c/src/tests/sptests) @@ -347,7 +345,9 @@ if test "$tests_enabled" = "yes"; then if test "$RTEMS_HAS_POSIX_API" = "yes"; then RTEMS_CHECK_MAKEFILE(c/src/tests/psxtests) fi - AC_CONFIG_SUBDIRS(c/src/tests/tools/generic) + if test -d "$srcdir/c/src/tests/tools/$target_cpu"; then + testtools_cfgdirs="$testtools_cfgdirs c/src/tests/tools/$target_cpu" + fi fi # If the HWAPI is enabled, the find the HWAPI Makefiles @@ -371,7 +371,6 @@ fi AC_SUBST(rtems_cv_prog_cc_cross) AC_SUBST(RTEMS_BSP_LIST) -AC_SUBST(RTEMS_HOST) AC_SUBST(RTEMS_HAS_CPLUSPLUS) AC_SUBST(RTEMS_USE_GCC272) AC_SUBST(BARE_CPU_CFLAGS) @@ -389,8 +388,10 @@ RTEMS_CHECK_MAKEFILE(c/src/lib/libmisc) RTEMS_CHECK_MAKEFILE(c/src/tests/samples) AC_CONFIG_SUBDIRS(c/build-tools) +AC_CONFIG_SUBDIRS(c/update-tools) AC_CONFIG_SUBDIRS($scoretools_cfgdirs) AC_CONFIG_SUBDIRS($bsptools_cfgdirs) +AC_CONFIG_SUBDIRS($testtools_cfgdirs) # FIXME: libhwapi needs a separate configure.in in future ;- # AC_CONFIG_SUBDIRS(c/src/lib/libhwapi) @@ -432,8 +433,7 @@ c/src/tests/support/include/Makefile c/src/tests/support/stubdr/Makefile c/src/tests/support/wrapup/Makefile c/src/tests/tools/Makefile -$makefiles -c/update-tools/Makefile) +$makefiles) echo echo target architecture: $target_cpu. |