[Libsysio-commit] HEAD: libsysio Makefile.am Rules.make configure.in
Brought to you by:
lward
Menu
▾
▴
[Libsysio-commit] HEAD: libsysio Makefile.am Rules.make configure.in
|
From: Ruth K. <rk...@us...> - 2008-10-15 22:01:11
|
Update of /cvsroot/libsysio/libsysio In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25646 Modified Files: Makefile.am Rules.make configure.in Log Message: Removing obsolete code related to cplant yod, lustre hack, and sockets driver. Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -b -B -p -r1.17 -r1.18 --- Makefile.am 17 Jun 2008 17:18:56 -0000 1.17 +++ Makefile.am 15 Oct 2008 22:01:01 -0000 1.18 @@ -13,8 +13,6 @@ 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 -include $(top_srcdir)/drivers/yod/module.mk -include $(top_srcdir)/drivers/sockets/module.mk lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a @@ -42,42 +40,19 @@ else OPTIONAL_NATIVE_SRCS = endif -if WITH_SOCKETS_DRIVER -OPTIONAL_SOCKETS_SRCS = $(SOCKETS_SRCS) -else -OPTIONAL_SOCKETS_SRCS = -endif - -if WITH_CPLANT_YOD -OPTIONAL_YOD_SRCS = $(YOD_SRCS) -else -OPTIONAL_YOD_SRCS = -endif - -if WITH_LUSTRE_HACK -# it would be better that let configure script check this -OPTIONAL_LUSTRE_CFLAGS = -fPIC -endif - -AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS) - __LIBBUILD_DIR__libsysio_a_SOURCES = \ $(SRCDIR_SRCS) \ $(THREAD_MODEL_POSIX_SRCS) \ $(OPTIONAL_STDDEV_SRCS) \ $(OPTIONAL_STDFD_SRCS) \ $(OPTIONAL_INCORE_SRCS) \ - $(OPTIONAL_SOCKETS_SRCS) \ - $(OPTIONAL_NATIVE_SRCS) \ - $(OPTIONAL_YOD_SRCS) + $(OPTIONAL_NATIVE_SRCS) include $(top_srcdir)/Rules.make EXTRA_DIST = Rules.make misc/init-env.sh $(TESTS_EXTRA) $(SRCDIR_EXTRA) \ $(INCLUDE_EXTRA) $(STDDEV_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \ - $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA) - -AM_CPPFLAGS += ${YOD_DRIVER_FLAGS} + $(NATIVE_EXTRA) really-clean: testsclean maintainer-clean -rm -rf autom4te-2.53.cache Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- Rules.make 17 Jun 2008 17:18:56 -0000 1.15 +++ Rules.make 15 Oct 2008 22:01:01 -0000 1.16 @@ -9,12 +9,6 @@ else STDEV_DEV_CPPFLAGS = endif -if WITH_SOCKETS_DRIVER -SOCKETS_CPPFLAGS=-DWITH_SOCKETS=1 -else -SOCKETS_CPPFLAGS= -endif - DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) $(STDDEV_DEV_CPPFLAGS) if WITH_THREAD_MODEL_POSIX @@ -26,6 +20,6 @@ endif AM_CPPFLAGS = \ $(THREAD_MODEL_POSIX_COMPILER_FLAGS) \ $(TRACING) \ - $(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \ + $(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) \ $(DEFER_INIT_CWD) $(SYSIO_LABEL_NAMES) $(_HAVE_STATVFS) \ -I$(top_srcdir)/include Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -w -b -B -p -r1.42 -r1.43 --- configure.in 11 Jul 2008 18:25:05 -0000 1.42 +++ configure.in 15 Oct 2008 22:01:01 -0000 1.43 @@ -148,63 +148,6 @@ AC_ARG_WITH(tracing, AM_CONDITIONAL(WITH_TRACING, test x$with_tracing = xyes) AC_SUBST(TRACING) -AC_ARG_WITH(cplant_yod, - AC_HELP_STRING([--with-cplant-yod],[build cplant yod I/O driver]), - [ case "${withval}" in - yes) if test x${with_stdfd_dev} != xyes; then - with_stdfd_dev=yes - AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = xyes) - fi ;; - no) ;; - *) AC_MSG_ERROR(bad value ${withval} for --with-cplant-yod);; - esac], - [with_cplant_yod=no]) -AM_CONDITIONAL(WITH_CPLANT_YOD, test x$with_cplant_yod = xyes) - -AC_ARG_WITH(cplant_tests, - AC_HELP_STRING([--with-cplant-tests=<cplant-build-path>], - [build libsysio tests for cplant platform]), - [ case "${withval}" in - yes) AC_MSG_ERROR(need path to compiler for --with-cplant-tests);; - no) with_cplant_tests=no;; - *) CC=${withval} - CCDEPMODE=${CC} - CPP="${CC} -E" - AC_CHECK_FILE(${CC}, - [ if test x${with_cplant_yod} != xyes; then - with_cplant_yod=yes - AM_CONDITIONAL(WITH_CPLANT_YOD, test x$with_cplant_yod = xyes) - fi], - [ AC_MSG_ERROR(path not found ${CC} for --with-cplant-tests) ]);; - esac], - [with_cplant_tests=no]) -AM_CONDITIONAL(WITH_CPLANT_TESTS, test x$with_cplant_tests != xno) - -AC_ARG_WITH(sockets, - AC_HELP_STRING([--with-sockets], - [build sockets interface driver (EXPERIMENTAL)]), - [ case "${withval}" in - yes) AC_MSG_ERROR(the sockets driver is broken right now);; - no) ;; - *) AC_MSG_ERROR(bad value ${withval} for --with-sockets) ;; - esac], - [with_sockets=no]) -AM_CONDITIONAL(WITH_SOCKETS_DRIVER, test x$with_sockets = xyes) - -AC_ARG_WITH(lustre-hack, - AC_HELP_STRING([--with-lustre-hack], - [have hacking code which needed to support liblustre driver (EXPERIMENTAL)]), - [ case "${withval}" in - yes) ;; - no) ;; - *) AC_MSG_ERROR(bad value ${withval} for --with-lustre-hack) ;; - esac], - [with_lustre_hack=no]) -AM_CONDITIONAL(WITH_LUSTRE_HACK, test x$with_lustre_hack = xyes) -if test x$with_lustre_hack = xyes; then - AC_DEFINE(HAVE_LUSTRE_HACK) -fi - AC_ARG_WITH(alternate-symbols, AC_HELP_STRING([--with-alternate-symbols@<:@=<qualifier>@:>@], [Prepend standard, public, symbols with a unique qualifer]), @@ -416,8 +359,6 @@ EOF done]) if test $sysio_asm_global_directive = UNKNOWN; then AC_MSG_ERROR(cannot determine asm global directive) -#else -# AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${sysio_asm_global_directive}) fi AC_CACHE_CHECK(for .set assembler directive, @@ -441,9 +382,6 @@ EOF sysio_asm_set_directive=no fi rm -f conftest*]) -#if test $sysio_asm_set_directive = yes; then -# AC_DEFINE(HAVE_ASM_SET_DIRECTIVE) -#fi AC_CACHE_CHECK(for assembler .weak directive, sysio_asm_weak_directive, [dnl |
