[Libsysio-commit] HEAD: libsysio Makefile.am Rules.make configure.in
Brought to you by:
lward
From: Lee W. <lw...@us...> - 2008-06-17 15:17:33
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32385 Modified Files: Makefile.am Rules.make configure.in Log Message: Integrate and initialize new, built-in, stddev pseudo-driver that gives us /dev/null, /dev/zero, and /dev/full functionality. Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- Makefile.am 16 Jul 2004 13:34:43 -0000 1.15 +++ Makefile.am 17 Jun 2008 15:17:30 -0000 1.16 @@ -9,6 +9,7 @@ endif include $(top_srcdir)/src/module.mk include $(top_srcdir)/include/module.mk include $(top_srcdir)/tests/module.mk +include $(top_srcdir)/dev/module.mk include $(top_srcdir)/dev/stdfd/module.mk include $(top_srcdir)/drivers/incore/module.mk include $(top_srcdir)/drivers/native/module.mk @@ -23,6 +24,12 @@ else OPTIONAL_STDFD_SRCS = endif +if WITH_STDDEV_DEV +OPTIONAL_STDDEV_SRCS = $(STDDEV_SRCS) +else +OPTIONAL_STDDEV_SRCS = +endif + if WITH_INCORE_DRIVER OPTIONAL_INCORE_SRCS = $(INCORE_SRCS) else @@ -56,6 +63,7 @@ AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS) __LIBBUILD_DIR__libsysio_a_SOURCES = \ $(SRCDIR_SRCS) \ + $(OPTIONAL_STDDEV_SRCS) \ $(OPTIONAL_STDFD_SRCS) \ $(OPTIONAL_INCORE_SRCS) \ $(OPTIONAL_SOCKETS_SRCS) \ @@ -65,7 +73,7 @@ __LIBBUILD_DIR__libsysio_a_SOURCES = \ include $(top_srcdir)/Rules.make EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \ - $(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ + $(INCLUDE_EXTRA) $(STDDEV_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA) AM_CPPFLAGS += ${YOD_DRIVER_FLAGS} Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- Rules.make 20 Aug 2007 19:28:12 -0000 1.13 +++ Rules.make 17 Jun 2008 15:17:30 -0000 1.14 @@ -3,6 +3,11 @@ STDFD_DEV_CPPFLAGS =-DSTDFD_DEV=1 -I$(to else STFD_DEV_CPPFLAGS = endif +if WITH_STDDEV_DEV +STDDEV_DEV_CPPFLAGS =-DSTDDEV_DEV=1 -I$(top_srcdir)/dev +else +STDEV_DEV_CPPFLAGS = +endif if WITH_SOCKETS_DRIVER SOCKETS_CPPFLAGS=-DWITH_SOCKETS=1 @@ -10,7 +15,7 @@ else SOCKETS_CPPFLAGS= endif -DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) +DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) $(STDDEV_DEV_CPPFLAGS) AM_CPPFLAGS = \ $(TRACING) \ Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.39 retrieving revision 1.40 diff -u -w -b -B -p -r1.39 -r1.40 --- configure.in 16 Apr 2008 12:49:39 -0000 1.39 +++ configure.in 17 Jun 2008 15:17:30 -0000 1.40 @@ -92,6 +92,17 @@ AC_ARG_WITH(stdfd-dev, [with_stdfd_dev=yes]) AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = xyes) +AC_ARG_WITH(stddev-dev, + AC_HELP_STRING([--with-stddev-dev], + [build standard file descriptors pseudo-driver]), + [ case "${withval}" in + yes) ;; + no) ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-stddev-dev) ;; + esac], + [with_stddev_dev=yes]) +AM_CONDITIONAL(WITH_STDDEV_DEV, test x$with_stddev_dev = xyes) + AC_ARG_WITH(zero-sum-memory, AC_HELP_STRING([--with-zero-sum-memory], [free all dynamically allocated memory at the end -- useful for debugging]), |