Author: adrian.chadd
Date: Mon Apr 13 01:19:08 2009
New Revision: 13927
Modified:
branches/LUSCA_HEAD/configure.in
branches/LUSCA_HEAD/src/fs/Makefile.am
Log:
Start removing diskd from the build process.
Modified: branches/LUSCA_HEAD/configure.in
==============================================================================
--- branches/LUSCA_HEAD/configure.in (original)
+++ branches/LUSCA_HEAD/configure.in Mon Apr 13 01:19:08 2009
@@ -397,7 +397,6 @@
fi
])
echo "Store modules built: $STORE_MODULES"
-NEED_DISKD=0
USE_AIOPS_WIN32=0
USE_LIBASYNCIO=1
NEED_COSSDUMP=0
@@ -405,13 +404,10 @@
AC_SUBST(STORE_OBJS)
STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`"
AC_SUBST(STORE_LIBS)
-dnl some store implementations need additional stuff built like
diskd_daemon
+dnl some store implementations need additional stuff built
STORE_MODULE_SUBDIRS=
for fs in $STORE_MODULES none; do
case "$fs" in
- diskd)
- NEED_DISKD=1
- ;;
aufs)
if test -z "$with_pthreads"; then
case "$host_os" in
@@ -439,7 +435,6 @@
esac
done
AC_SUBST(STORE_MODULES)
-AM_CONDITIONAL([NEED_DISKD], [test "$NEED_DISKD" = 1])
AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
AM_CONDITIONAL([USE_LIBASYNCIO], [test "$USE_LIBASYNCIO" = 1])
AM_CONDITIONAL([NEED_COSSDUMP], [test "$NEED_COSSDUMP" = 1])
Modified: branches/LUSCA_HEAD/src/fs/Makefile.am
==============================================================================
--- branches/LUSCA_HEAD/src/fs/Makefile.am (original)
+++ branches/LUSCA_HEAD/src/fs/Makefile.am Mon Apr 13 01:19:08 2009
@@ -5,27 +5,15 @@
AUTOMAKE_OPTIONS = subdir-objects
-EXTRA_LIBRARIES = libaufs.a libcoss.a libdiskd.a libnull.a libufs.a
+EXTRA_LIBRARIES = libaufs.a libcoss.a libnull.a libufs.a
noinst_LIBRARIES = @STORE_LIBS@
EXTRA_libaufs_a_SOURCES = aufs/aiops.c aufs/aiops_win32.c
libaufs_a_SOURCES = aufs/store_asyncufs.h aufs/store_dir_aufs.c
aufs/store_io_aufs.c
libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.c
coss/store_dir_coss.c
-libdiskd_a_SOURCES = diskd/diskd.c diskd/store_dir_diskd.c
diskd/store_diskd.h \
- diskd/store_io_diskd.c
libnull_a_SOURCES = null/store_null.c
libufs_a_SOURCES = ufs/store_dir_ufs.c ufs/store_io_ufs.c ufs/store_ufs.h
-
-if NEED_DISKD
-DISKD = diskd-daemon
-else
-DISKD =
-endif
-
-libexec_PROGRAMS = $(DISKD)
-
-diskd_daemon_SOURCES = diskd/diskd.c
LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
