LU-5317 build: fix build of Xeon Phi client RPMs

[fs/lustre-release.git] / lustre / utils / Makefile.am

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index dde2048..da0213f 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -11,11 +11,9 @@ AM_LDFLAGS := -L$(top_builddir)/lnet/utils
 MNTMODLDFLAGS := -rdynamic -ldl
 MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
 
 MNTMODLDFLAGS := -rdynamic -ldl
 MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
 

-LIBCFSUTIL := $(top_builddir)/libcfs/libcfs/libcfsutil.a
-

 LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \
 LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \

-            $(top_builddir)/libcfs/libcfs/libcfs.a \
-            $(LIBCFSUTIL)
+            $(top_builddir)/libcfs/libcfs/libcfsutil.a \
+            $(top_builddir)/libcfs/libcfs/libcfs.a

 
 sbin_scripts = lrun
 bin_scripts = llstat llobdstat plot-llstat llbackup
 
 sbin_scripts = lrun
 bin_scripts = llstat llobdstat plot-llstat llbackup


@@ -51,8 +49,8 @@ lctl_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
 lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lfs_SOURCES = lfs.c
 lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lfs_SOURCES = lfs.c

-lfs_LDADD := liblustreapi.a $(LIBCFSUTIL) $(LIBREADLINE)
-lfs_DEPENDENCIES := liblustreapi.a
+lfs_LDADD := liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE)
+lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a

 
 loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
 loadgen_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
 
 loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
 loadgen_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)