diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-08 08:12:15 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-08 08:12:15 +0000 |
| commit | 9483fbf37027785daea96169315a5cf2fb75ae99 (patch) | |
| tree | 40b78fa22fe49a84f5de85f075f15a304f6a7f36 /cpukit | |
| parent | 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-9483fbf37027785daea96169315a5cf2fb75ae99.tar.bz2 | |
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Merge-in libblock/configure.ac.
* Makefile.am: Add libblock to SUBDIRS.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/configure.ac | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f1fcfb4856..5c2394ce56 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Merge-in libblock/configure.ac. + * Makefile.am: Add libblock to SUBDIRS. + +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Merge-in ada/configure.ac. * Makefile.am: Add ada to SUBDIRS. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index fb5d5ab278..86a7bda1f4 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I aclocal include $(top_srcdir)/automake/multilib.am -SUBDIRS = . include ada score rtems sapi @subdirs@ wrapup +SUBDIRS = . include ada score rtems sapi libblock @subdirs@ wrapup noinst_DATA = preinstall-stamp diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 92c67de3a2..846f18cc38 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -67,7 +67,6 @@ AM_CONDITIONAL([LIBSCORECPU], [test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"]) AC_CONFIG_SUBDIRS([libcsupport]) -AC_CONFIG_SUBDIRS([libblock]) AC_CONFIG_SUBDIRS([libfs]) AS_IF([test x"$HAS_NETWORKING" = x"yes"],[ AC_CONFIG_SUBDIRS(libnetworking) @@ -151,9 +150,10 @@ rtems/Makefile sapi/Makefile score/Makefile score/cpu/Makefile -wrapup/Makefile ]) +AC_CONFIG_FILES([libblock/Makefile]) AC_CONFIG_FILES([ada/Makefile]) +AC_CONFIG_FILES([wrapup/Makefile]) AC_OUTPUT |