X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmpi%2FMakefile.am;h=7cc95af3523402f20f1fc122d4fa15c58311c001;hb=a197c77470772b0159c983a150b0f60d26c5bcc9;hp=bf0c1cb9d6c9a969e6c31b0e5b319b6fa71f6c3e;hpb=6a99fbedbffddae90e6b28c78141f98957209247;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mpi/Makefile.am b/lustre/tests/mpi/Makefile.am
index bf0c1cb..7cc95af 100644
--- a/lustre/tests/mpi/Makefile.am
+++ b/lustre/tests/mpi/Makefile.am
@@ -1,17 +1,32 @@
 # Lustre MPI test Makefile
-AM_CPPFLAGS = $(LLCPPFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS
-AM_CFLAGS = $(LLCFLAGS)
+AM_CFLAGS := -fPIC -D_GNU_SOURCE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
 
 CC = @MPICC_WRAPPER@
 
-noinst_PROGRAMS = parallel_grouplock write_append_truncate createmany_mpi
-noinst_PROGRAMS += mdsrate write_disjoint
+THETESTS = parallel_grouplock write_append_truncate createmany_mpi \
+	   mdsrate write_disjoint cascading_rw rr_alloc
+
+if TESTS
+if MPITESTS
+if RHEL
+testdir = @MPI_BIN@
+else
 testdir = $(libdir)/lustre/tests
-test_SCRIPTS = $(noinst_PROGRAMS)
+endif
+test_PROGRAMS = $(THETESTS)
+else
+noinst_PROGRAMS = $(THETESTS)
+endif
+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
+rr_alloc_SOURCES=rr_alloc.c
+
+cascading_rw_SOURCES=cascading_rw.c lp_utils.c lp_utils.h
+cascading_rw_LDADD=$(top_builddir)/lustre/utils/liblustreapi.la
+
 mdsrate_SOURCES=mdsrate.c
-mdsrate_LDADD=-L$(top_builddir)/lustre/utils -llustreapi
+mdsrate_LDADD=$(top_builddir)/lustre/utils/liblustreapi.la