[Libsysio-commit] b_lustre: libsysio/tests module.mk Makefile.am

[Mei <me...@us...>]

Update of /cvsroot/libsysio/libsysio/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/tests

Modified Files:
      Tag: b_lustre
	Makefile.am 
Added Files:
      Tag: b_lustre
	module.mk 
Log Message:
merge HEAD to b_lustre



--- NEW FILE ---
TESTS_EXTRA = $(shell ls tests/*.[ch] tests/*.sh tests/*.p[lm]) \
	tests/Makefile.am tests/Makefile.in tests/module.mk

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/Makefile.am,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -u -w -b -B -p -r1.8.4.3 -r1.8.4.4
--- Makefile.am	1 Nov 2003 03:08:23 -0000	1.8.4.3
+++ Makefile.am	11 Jan 2004 05:55:53 -0000	1.8.4.4
@@ -6,37 +6,30 @@ CLEANFILES=drv_data.c
 if WITH_NATIVE_DRIVER
 NATIVE_DRIVER_NAME=native
 NATIVE_DRIVER_CFLAGS= -I$(top_srcdir)/drivers/native
-NATIVE_DRIVER_LIB= $(top_builddir)/drivers/native/libsysio_native.a
 else
 NATIVE_DRIVER_NAME=native
 NATIVE_DRIVER_CFLAGS=
-NATIVE_DRIVER_LIB=
 endif
 
 if WITH_INCORE_DRIVER
 INCORE_DRIVER_NAME=incore
 INCORE_DRIVER_CFLAGS= -I$(top_srcdir)/drivers/incore
-INCORE_DRIVER_LIB= $(top_builddir)/drivers/incore/libsysio_incore.a
 else
 INCORE_DRIVER_NAME=incore
 INCORE_DRIVER_CFLAGS=
-INCORE_DRIVER_LIB=
 endif
 
 if WITH_STDFD_DEV
 STDFD_DEV_NAME=stdfd
 STDFD_DEV_CFLAGS= -I$(top_srcdir)/dev/stdfd
-STDFD_DEV_LIB= $(top_builddir)/dev/stdfd/libsysio_stdfd.a
 else
 STDFD_DEV_NAME=stdfd
 STDFD_DEV_CFLAGS=
-STDFD_DEV_LIB=
 endif
 
 if WITH_CPLANT_YOD
 YOD_DRIVER_NAME=yod
 YOD_DRIVER_CFLAGS= -DCPLANT_YOD
-YOD_DRIVER_LIB=$(top_builddir)/drivers/yod/libsysio_yod.a
 else
 YOD_DRIVER_NAME=
 YOD_DRIVER_CFLAGS=
@@ -67,10 +60,7 @@ CFL=$(AM_CFLAGS) $(AM_CPPFLAGS) \
 	$(NATIVE_DRIVER_CFLAGS) $(INCORE_DRIVER_CFLAGS) \
 	$(STDFD_DEV_CFLAGS) $(YOD_DRIVER_CFLAGS)
 
-LIBS=$(NATIVE_DRIVER_LIB) $(INCORE_DRIVER_LIB) \
-	$(STDFD_DEV_LIB) $(YOD_DRIVER_LIB) \
-	$(SOCKETS_DRIVER_LIB) \
-	$(top_builddir)/src/libsysio.a
+LIBS=$(LIBBUILD_DIR)/libsysio.a
 
 test_copy_SOURCES=test_copy.c $(CMNSRC)
 test_copy_CFLAGS=$(CFL)
@@ -127,10 +117,9 @@ test_driver_CFLAGS=$(CFL)
 test_driver_LDADD=$(LIBS)
 test_driver_DEPENDENCIES=$(LIBS)
 
-EXTRA_DIST=$(shell ls *.pl *.pm) gendrvdata.sh test.h test_driver.h
-
 drv_data.c: $(CONFIG_DEPENDENCIES) $(top_srcdir)/tests/gendrvdata.sh
 	test -z "drv_data.c" && rm -f drv_data.c; \
 	$(SHELL) $(top_srcdir)/tests/gendrvdata.sh $(DRIVERS) > drv_data.c
 
+AM_CFLAGS = -L$(LIBBUILD_DIR)
 include $(top_srcdir)/Rules.make