diff options
Diffstat (limited to '')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/configure.ac | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 5c2394ce56..b684b24cda 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 libfs/configure.ac. + * Makefile.am: Add libfs to SUBDIRS. + +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Merge-in libblock/configure.ac. * Makefile.am: Add libblock to SUBDIRS. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 86a7bda1f4..7b60c144c3 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 libblock @subdirs@ wrapup +SUBDIRS = . include ada score rtems sapi libblock libfs @subdirs@ wrapup noinst_DATA = preinstall-stamp diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 846f18cc38..c3182dce80 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([libfs]) AS_IF([test x"$HAS_NETWORKING" = x"yes"],[ AC_CONFIG_SUBDIRS(libnetworking) ## FIXME: Should better use a feature-based test @@ -153,7 +152,14 @@ score/cpu/Makefile ]) AC_CONFIG_FILES([libblock/Makefile]) + +AC_CONFIG_FILES([libfs/Makefile +libfs/src/Makefile +libfs/src/imfs/Makefile +libfs/src/dosfs/Makefile]) + AC_CONFIG_FILES([ada/Makefile]) + AC_CONFIG_FILES([wrapup/Makefile]) AC_OUTPUT |