diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-29 15:59:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-29 15:59:05 +0000 |
| commit | f31a0787b3757325764ff701012e2cd07f7ceb6e (patch) | |
| tree | b8bd55376cf1d1f305a12c700f44945e3b90a28d | |
| parent | 2002-08-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-f31a0787b3757325764ff701012e2cd07f7ceb6e.tar.bz2 | |
2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* score/include/Makefile.am: Remove cpuopt.h generation.
* configure.ac: Correct package name.
Don't build ada if POSIX is disabled.
Generate cpuopt.h on the fly, filter out autoconf-2.53 PACKAGE crap.
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/configure.ac | 23 | ||||
| -rw-r--r-- | cpukit/score/include/Makefile.am | 14 |
3 files changed, 27 insertions, 17 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index c81809fd67..72b20b4cda 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * score/include/Makefile.am: Remove cpuopt.h generation. + * configure.ac: Correct package name. + Don't build ada if POSIX is disabled. + Generate cpuopt.h on the fly, filter out autoconf-2.53 PACKAGE crap. + +2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/prog-gnat.m4: New. * configure.ac: Add ada subdir handling. diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 0422376179..bceac6a6b1 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -3,7 +3,7 @@ ## $Id$ AC_PREREQ(2.52) -AC_INIT([rtems-c-src-exec],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) +AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([score]) RTEMS_TOP(..) AC_CONFIG_AUX_DIR(..) @@ -85,7 +85,7 @@ AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"]) AC_ARG_ENABLE([ada],[enable ada support]) AS_IF([test x"$enable_ada" = x"yes"],[ - AS_IF([test -d ${srcdir}/ada],[ + AS_IF([test x"$HAS_POSIX_API" = x"yes"],[ AC_CONFIG_SUBDIRS([ada]) ]) ]) @@ -108,7 +108,24 @@ AS_IF([test x"${enable_unixlib}" = x"yes"], [to indicate RTEMS using RTEMS's unixlib])] ) -AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h) + +AM_CONFIG_HEADER([score/include/rtems/score/cpuopts-tmp.h],[ +echo "/* target cpu dependent options file */" >$tmp/config.h +echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h +echo >>$tmp/config.h +echo "#ifndef __CPU_OPTIONS_h" >>$tmp/config.h +echo "#define __CPU_OPTIONS_h" >>$tmp/config.h +echo >>$tmp/config.h +sed -e '/.*PACKAGE.*/d' score/include/rtems/score/cpuopts-tmp.h >> $tmp/config.h +echo >>$tmp/config.h +echo "#endif" >>$tmp/config.h +AS_IF([cmp -s score/include/rtems/score/cpuopts.h $tmp/config.h 2>/dev/null], + [AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged]) + rm -f $tmp/config.h], + [AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h]) + rm -f score/include/rtems/score/cpuopts.h + mv $tmp/config.h score/include/rtems/score/cpuopts.h]) +]) AC_ENABLE_MULTILIB([Makefile],[..]) diff --git a/cpukit/score/include/Makefile.am b/cpukit/score/include/Makefile.am index 8dc4904834..afd37e34f3 100644 --- a/cpukit/score/include/Makefile.am +++ b/cpukit/score/include/Makefile.am @@ -46,20 +46,6 @@ endif PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) -# make the cpu dependent options file -# FIXME: We are exporting a config-header here, which is a bad idea in -# general -rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h - @echo "/* target cpu dependent options file */" >$@ - @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@ - @echo >>$@ - @echo "#ifndef __CPU_OPTIONS_h" >>$@ - @echo "#define __CPU_OPTIONS_h" >>$@ - @echo >>$@ - @cat rtems/score/cpuopts-tmp.h | sed -e '/.*PACKAGE.*/d' >>$@ - @echo >>$@ - @echo "#endif" >>$@ - all-local: $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am |