-LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a
+LIBCFS = $(top_builddir)/libcfs/libcfs/libcfs.a
# Lustre test Makefile
AM_CPPFLAGS = $(LLCPPFLAGS) -I/opt/lam/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS
noinst_PROGRAMS += small_write multiop ll_sparseness_verify
noinst_PROGRAMS += ll_sparseness_write mrename ll_dirstripe_verify mkdirmany
noinst_PROGRAMS += openfilleddirunlink rename_many memhog
-noinst_PROGRAMS += mmap_sanity writemany reads flocks_test
-noinst_PROGRAMS += write_time_limit rwv copytool lgetxattr_size_check checkfiemap
+noinst_PROGRAMS += mmap_sanity writemany reads flocks_test flock_deadlock
+noinst_PROGRAMS += write_time_limit rwv lgetxattr_size_check checkfiemap
bin_PROGRAMS = mcreate munlink
testdir = $(libdir)/lustre/tests
mmap_sanity_SOURCES= mmap_sanity.c
-LIBLUSTREAPI := $(top_builddir)/lustre/utils/liblustreapi.a
+LIBLUSTREAPI = $(top_builddir)/lustre/utils/liblustreapi.a
multiop_LDADD=$(LIBLUSTREAPI) -lrt $(PTHREAD_LIBS) $(LIBCFS)
-copytool_LDADD=$(LIBLUSTREAPI) $(LIBCFS)
it_test_LDADD=$(LIBCFS)
rwv_LDADD=$(LIBCFS)
ll_dirstripe_verify_SOURCES= ll_dirstripe_verify.c
-ll_dirstripe_verify_LDADD= -L$(top_builddir)/lustre/utils -llustreapi $(LIBCFS)
+ll_dirstripe_verify_LDADD= -L$(top_builddir)/lustre/utils $(PTHREAD_LIBS) -llustreapi $(LIBCFS)
flocks_test_SOURCES=flocks_test.c
flocks_test_LDADD=-lpthread