diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-03-25 07:20:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-03-25 07:20:58 +0000 |
| commit | db3e91f2db1ec0d2e78fb118ec27678b161aca8a (patch) | |
| tree | 981de07bf4f6454b4a1b38529fc3699691972a3f | |
| parent | 2003-03-24 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-db3e91f2db1ec0d2e78fb118ec27678b161aca8a.tar.bz2 | |
Merger from rtems-4-6-branch.
| -rw-r--r-- | c/src/ChangeLog | 16 | ||||
| -rw-r--r-- | c/src/configure.ac | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index e43d77b1f4..dd26fdc55d 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,19 @@ +2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + +2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Add support/. + * support/.cvsignore: New. + * support/Makefile.am: New. + * support/version.c: New. + * wrapup/Makefile.am: Add support/libsupport.a. + +2003-03-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Use SRC += instead of make-vars. + 2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/c/src/configure.ac b/c/src/configure.ac index 69b1b53cf3..4bcd750932 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-c-src],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([optman]) RTEMS_TOP(../..) -AC_CONFIG_AUX_DIR(../..) RTEMS_ENABLE_CXX RTEMS_ENABLE_NETWORKING @@ -148,6 +147,7 @@ AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[ BSP_SUBDIRS="$BSP_SUBDIRS librtems++" ]) +BSP_SUBDIRS="$BSP_SUBDIRS support" BSP_SUBDIRS="$BSP_SUBDIRS wrapup" AC_ARG_ENABLE([ada], @@ -190,6 +190,6 @@ AC_CONFIG_FILES([Makefile], [RTEMS_BSP=${RTEMS_BSP} MAKE=${MAKE}]) -AC_CONFIG_FILES([wrapup/Makefile]) +AC_CONFIG_FILES([support/Makefile wrapup/Makefile]) AC_OUTPUT |