diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-05-28 17:21:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-05-28 17:21:23 +0000 |
| commit | 35cd6aed1bf30eed9f087a4c2ec008306f4fa67f (patch) | |
| tree | 773bbeffb52d0f4e7467bb62ce7c9b4be42cda44 /cpukit | |
| parent | 2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-35cd6aed1bf30eed9f087a4c2ec008306f4fa67f.tar.bz2 | |
2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add libblock. Add libfs. Add AM_CONDITIONAL(UNIX).
* wrapup/Makefile.am: Add libblock, libfs/dosfs, libfs/imfs.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/configure.ac | 4 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 9 |
3 files changed, 17 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index d29007f1a2..2dede5be2e 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Add libblock. Add libfs. Add AM_CONDITIONAL(UNIX). + * wrapup/Makefile.am: Add libblock, libfs/dosfs, libfs/imfs. + 2002-05-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Add libcsupport. diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 0834122645..9858da24fe 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -60,6 +60,8 @@ AS_IF([test x"$HAS_ITRON_API" = x"yes"], RTEMS_CPU_SUBDIRS([score/cpu]) AC_CONFIG_SUBDIRS([libcsupport]) +AC_CONFIG_SUBDIRS([libblock]) +AC_CONFIG_SUBDIRS([libfs]) RTEMS_DEFINE_POSIX_API RTEMS_DEFINE_ITRON_API @@ -72,6 +74,8 @@ AS_IF([test x"${RTEMS_CPU}" = x"unix"],[ test -n "${enable_unixlib}" || enable_unixlib="yes" ]) +AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"]) + AS_IF([test x"${enable_unixlib}" = x"yes"], [AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1], [to indicate RTEMS using RTEMS's unixlib])] diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index b753a34256..4b574be1f2 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -25,8 +25,15 @@ endif LIBCSUPPORT_OBJS = $(wildcard ../libcsupport/src/$(ARCH)/*.o) +LIBBLOCK_OBJS = $(wildcard ../libblock/$(ARCH)/*.o) +if !UNIX +LIBDOSFS_OBJS = $(wildcard ../libfs/src/dosfs/$(ARCH)/*.o) +endif +LIBIMFS_OBJS = $(wildcard ../libfs/src/imfs/$(ARCH)/*.o) + OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \ - $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) + $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \ + $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) $(LIB): ${OBJS} $(make-library) |