X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Fmpi%2FMakefile.am;h=a1a4246f23be2f7945ae1912c5e4628efd21f218;hb=ab1df50e73ff838053fff62302c3b884e4e19552;hp=c128459bed43ef35b46320081c279a1d1fc95977;hpb=21d716e6c16424d9deb646456758ebbaa9c70fec;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mpi/Makefile.am b/lustre/tests/mpi/Makefile.am
index c128459..a1a4246 100644
--- a/lustre/tests/mpi/Makefile.am
+++ b/lustre/tests/mpi/Makefile.am
@@ -1,22 +1,31 @@
 # Lustre MPI test Makefile
-AM_CPPFLAGS = $(LLCPPFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS
-AM_CFLAGS = $(LLCFLAGS)
+AM_CFLAGS := -fPIC \
+	     -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1
+
 LIBCFS :=  $(top_builddir)/libcfs/libcfs/libcfs.a
+LIBLUSTREAPI = $(top_builddir)/lustre/utils/liblustreapi.la
 
 CC = @MPICC_WRAPPER@
 
-noinst_PROGRAMS = parallel_grouplock write_append_truncate createmany_mpi
-noinst_PROGRAMS += mdsrate write_disjoint cascading_rw
+THETESTS = parallel_grouplock write_append_truncate createmany_mpi \
+	   mdsrate write_disjoint cascading_rw
+
+if TESTS
+if MPITESTS
 testdir = $(libdir)/lustre/tests
-test_SCRIPTS = $(noinst_PROGRAMS)
+test_PROGRAMS = $(THETESTS)
+else
+noinst_PROGRAMS = $(THETESTS)
+endif
+else
+noinst_PROGRAMS = $(THETESTS)
+endif
 
-write_append_truncate_SOURCES=write_append_truncate.c
-write_disjoint_SOURCES=write_disjoint.c
 createmany_mpi_SOURCES=createmany-mpi.c
 parallel_grouplock_SOURCES=parallel_grouplock.c lp_utils.c lp_utils.h
 
 cascading_rw_SOURCES=cascading_rw.c lp_utils.c lp_utils.h
-cascading_rw_LDADD=-L$(top_builddir)/lustre/utils -llustreapi $(LIBCFS)
+cascading_rw_LDADD=$(LIBLUSTREAPI) $(LIBCFS)
 
 mdsrate_SOURCES=mdsrate.c
-mdsrate_LDADD=-L$(top_builddir)/lustre/utils -llustreapi $(LIBCFS)
+mdsrate_LDADD=$(LIBLUSTREAPI) $(LIBCFS)