Merger from rtems-4-6-branch.

This commit is contained in:
Ralf Corsepius
2003-03-25 07:20:58 +00:00
parent 81aa167d52
commit db3e91f2db
2 changed files with 18 additions and 2 deletions

View File

@@ -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> 2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: AM_INIT_AUTOMAKE([1.7.2]). * configure.ac: AM_INIT_AUTOMAKE([1.7.2]).

View File

@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
AC_INIT([rtems-c-src],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_INIT([rtems-c-src],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([optman]) AC_CONFIG_SRCDIR([optman])
RTEMS_TOP(../..) RTEMS_TOP(../..)
AC_CONFIG_AUX_DIR(../..)
RTEMS_ENABLE_CXX RTEMS_ENABLE_CXX
RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_NETWORKING
@@ -148,6 +147,7 @@ AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[
BSP_SUBDIRS="$BSP_SUBDIRS librtems++" BSP_SUBDIRS="$BSP_SUBDIRS librtems++"
]) ])
BSP_SUBDIRS="$BSP_SUBDIRS support"
BSP_SUBDIRS="$BSP_SUBDIRS wrapup" BSP_SUBDIRS="$BSP_SUBDIRS wrapup"
AC_ARG_ENABLE([ada], AC_ARG_ENABLE([ada],
@@ -190,6 +190,6 @@ AC_CONFIG_FILES([Makefile],
[RTEMS_BSP=${RTEMS_BSP} [RTEMS_BSP=${RTEMS_BSP}
MAKE=${MAKE}]) MAKE=${MAKE}])
AC_CONFIG_FILES([wrapup/Makefile]) AC_CONFIG_FILES([support/Makefile wrapup/Makefile])
AC_OUTPUT AC_OUTPUT