LU-6245 libcfs: create userland and kernel string operations

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

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index f737ddb..1faf1cf 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -11,32 +11,33 @@ AM_LDFLAGS := -L$(top_builddir)/lnet/utils
 MNTMODLDFLAGS := -rdynamic -ldl
 MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
 
-LIBCFSUTIL := $(top_builddir)/libcfs/libcfs/libcfsutil.a
-
 LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \
-            $(top_builddir)/libcfs/libcfs/libcfs.a \
-            $(LIBCFSUTIL)
-
-sbin_scripts = lrun
-bin_scripts = llstat llobdstat plot-llstat llbackup
+            $(top_builddir)/libcfs/libcfs/libcfsutil.a \
+            $(top_builddir)/libcfs/libcfs/libcfs.a
 
+if TESTS
 EXTRA_PROGRAMS = wirecheck
+endif
 
 if UTILS
 # mount only finds helpers in /sbin
 rootsbin_PROGRAMS = mount.lustre
-sbin_PROGRAMS = lctl wiretest l_getidentity llverfs llverdev \
-       llog_reader lr_reader lshowmount lustre_rsync \
-       ll_recover_lost_found_objs ltrack_stats ll_decode_filter_fid
+bin_SCRIPTS   = llstat llobdstat plot-llstat
+bin_PROGRAMS  = lfs
+sbin_PROGRAMS = lctl l_getidentity llverfs lustre_rsync ltrack_stats
+
+if TESTS
+bin_PROGRAMS  += req_layout
+sbin_PROGRAMS += wiretest
+endif # TESTS
+
 if SERVER
-sbin_PROGRAMS += mkfs.lustre tunefs.lustre
+sbin_PROGRAMS += mkfs.lustre tunefs.lustre llverdev lr_reader \
+       ll_recover_lost_found_objs ll_decode_filter_fid llog_reader
 endif
 if LIBPTHREAD
-sbin_PROGRAMS += loadgen lhsmtool_posix
+sbin_PROGRAMS += lhsmtool_posix
 endif
-bin_PROGRAMS = lfs req_layout
-bin_SCRIPTS = $(bin_scripts)
-sbin_SCRIPTS = $(sbin_scripts)
 
 pkglib_LTLIBRARIES =
 lib_LIBRARIES = liblustreapi.a
@@ -51,12 +52,8 @@ lctl_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
 lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lfs_SOURCES = lfs.c
-lfs_LDADD := liblustreapi.a $(LIBCFSUTIL) $(LIBREADLINE)
-lfs_DEPENDENCIES := liblustreapi.a
-
-loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
-loadgen_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
-loadgen_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+lfs_LDADD := liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE)
+lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lustre_rsync_SOURCES = lustre_rsync.c obd.c lustre_cfg.c lustre_rsync.h
 lustre_rsync_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
@@ -66,8 +63,6 @@ ll_recover_lost_found_objs_SOURCES = ll_recover_lost_found_objs.c
 ll_recover_lost_found_objs_LDADD := $(LIBPTLCTL)
 ll_recover_lost_found_objs_DEPENDENCIES := $(LIBPTLCTL)
 
-lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
-
 if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
 E2PLIB = -le2p
@@ -86,12 +81,15 @@ llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
 
 llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
 
-L_IOCTL := $(top_builddir)/libcfs/libcfs/util/l_ioctl.c
+L_STRING := $(top_builddir)/libcfs/libcfs/util/string.c
 L_KERNELCOMM := $(top_builddir)/libcfs/libcfs/kernel_user_comm.c
 liblustreapitmp_a_SOURCES = liblustreapi.c liblustreapi_hsm.c \
                            liblustreapi_nodemap.c lustreapi_internal.h \
-                           liblustreapi_json.c $(L_IOCTL) $(L_KERNELCOMM)
+                           liblustreapi_json.c liblustreapi_layout.c \
+                           liblustreapi_lease.c liblustreapi_util.c \
+                           $(L_KERNELCOMM) $(L_STRING)
 
+if UTILS
 # build static and shared lib lustreapi
 liblustreapi.a : liblustreapitmp.a
        rm -f liblustreapi.a liblustreapi.so
@@ -108,6 +106,7 @@ install-exec-hook: liblustreapi.so
            $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f; \
          else :; fi; \
        done
+endif
 
 if LDISKFS_ENABLED
 libiam_a_SOURCES = libiam.c
@@ -116,8 +115,8 @@ endif
 req_layout_SOURCES = req-layout.c
 
 llog_reader_SOURCES = llog_reader.c
-llog_reader_LDADD := $(LIBPTLCTL)
-llog_reader_DEPENDENCIES := $(LIBPTLCTL)
+llog_reader_LDADD := $(LIBPTLCTL) liblustreapi.a
+llog_reader_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lr_reader_SOURCES = lr_reader.c
 
@@ -138,6 +137,7 @@ pkglib_LTLIBRARIES += mount_osd_ldiskfs.la
 
 mount_osd_ldiskfs_la_SOURCES = mount_utils_ldiskfs.c
 mount_osd_ldiskfs_la_LDFLAGS = -shared -export-dynamic -module -avoid-version
+mount_osd_ldiskfs_la_LIBADD := $(SELINUX)
 endif
 
 mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h
@@ -165,17 +165,17 @@ l_getidentity_DEPENDENCIES := $(LIBPTLCTL)
 ltrack_stats_SOURCES = ltrack_stats.c
 
 lhsmtool_posix_SOURCES = lhsmtool_posix.c
-lhsmtool_posix_LDADD := liblustreapi.a $(PTHREAD_LIBS)
-lhsmtool_posix_DEPENDENCIES := liblustreapi.a
+lhsmtool_posix_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
+lhsmtool_posix_DEPENDENCIES := liblustreapi.a $(LIBPTLCTL)
 
 wirecheck_SOURCES = wirecheck.c
 wirecheck_CPPFLAGS = -DCC="\"$(CC)\""
 
 wiretest_SOURCES = wiretest.c
 
-endif
+endif # UTILS
 
-EXTRA_DIST = $(sbin_scripts) $(bin_scripts)
+EXTRA_DIST = llstat llobdstat plot-llstat
 
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck
@@ -183,4 +183,3 @@ newwiretest: wirehdr.c wirecheck
        LANG=C ./wirecheck >> wiretest.c
        cp ../ptlrpc/wirehdr.c ../ptlrpc/wiretest.c
        LANG=C ./wirecheck >> ../ptlrpc/wiretest.c
-