Revert "LU-5541 build: build static and dynamic liblustreapi"

[fs/lustre-release.git] / lustre / tests / mpi / Makefile.am

diff --git a/lustre/tests/mpi/Makefile.am b/lustre/tests/mpi/Makefile.am
index a1a4246..ac7acb1 100644 (file)
--- a/lustre/tests/mpi/Makefile.am
+++ b/lustre/tests/mpi/Makefile.am
@@ -3,29 +3,21 @@ 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@
 
-THETESTS = parallel_grouplock write_append_truncate createmany_mpi \
-          mdsrate write_disjoint cascading_rw
-
-if TESTS
-if MPITESTS
+noinst_PROGRAMS = parallel_grouplock write_append_truncate createmany_mpi
+noinst_PROGRAMS += mdsrate write_disjoint cascading_rw
 testdir = $(libdir)/lustre/tests
-test_PROGRAMS = $(THETESTS)
-else
-noinst_PROGRAMS = $(THETESTS)
-endif
-else
-noinst_PROGRAMS = $(THETESTS)
-endif
+test_SCRIPTS = $(noinst_PROGRAMS)
 
+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=$(LIBLUSTREAPI) $(LIBCFS)
+cascading_rw_LDADD=-L$(top_builddir)/lustre/utils -llustreapi $(LIBCFS)
 
 mdsrate_SOURCES=mdsrate.c
-mdsrate_LDADD=$(LIBLUSTREAPI) $(LIBCFS)
+mdsrate_LDADD=-L$(top_builddir)/lustre/utils -llustreapi $(LIBCFS)