X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=df3c2c93d96880fbd36f1ad14be6aa9e2433647e;hb=0561c144cc1bb623e05d08b5055009e8d86047f4;hp=44ae5230e718714b2fda9cbbbef4783ffdd2b435;hpb=6bc3237477069c8ddc70deee6e0d7cbbbdf92a08;p=fs%2Flustre-release.git

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 44ae523..df3c2c9 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -24,11 +24,14 @@ endif
 
 # mount only finds helpers in /sbin
 rootsbin_PROGRAMS = mount.lustre
+if SERVER
+rootsbin_PROGRAMS += mount.lustre_tgt
+endif
 bin_SCRIPTS   = llstat llobdstat plot-llstat
 bin_PROGRAMS  = lfs
 sbin_SCRIPTS  = ldlm_debug_upcall
 sbin_PROGRAMS = lctl l_getidentity llverfs lustre_rsync ll_decode_linkea \
-		llsom_sync
+		llsom_sync l_foreign_symlink
 
 if TESTS
 sbin_PROGRAMS += wiretest
@@ -36,7 +39,8 @@ endif # TESTS
 
 if SERVER
 sbin_PROGRAMS += mkfs.lustre tunefs.lustre llverdev lr_reader lshowmount \
-		 ll_decode_filter_fid llog_reader l_tunedisk
+		 ll_decode_filter_fid llog_reader l_tunedisk \
+		 ofd_access_log_reader
 endif
 if LIBPTHREAD
 sbin_PROGRAMS += lhsmtool_posix
@@ -47,6 +51,7 @@ if GETSEPOL
 sbin_PROGRAMS += l_getsepol
 endif
 endif
+endif # UTILS
 
 lib_LIBRARIES =
 noinst_LIBRARIES =
@@ -57,7 +62,6 @@ endif
 
 pkglib_LTLIBRARIES =
 lib_LTLIBRARIES = liblustreapi.la
-endif # UTILS
 
 lctl_SOURCES = portals.c debug.c obd.c lustre_cfg.c lctl.c obdctl.h
 if SERVER
@@ -67,6 +71,7 @@ lctl_LDADD :=  liblustreapi.la $(PTHREAD_LIBS) -lyaml
 lctl_DEPENDENCIES := liblustreapi.la
 
 lfs_SOURCES = lfs.c lfs_project.c lfs_project.h
+lfs_CFLAGS := -fPIC $(AM_CFLAGS) -I $(top_builddir)/lnet/utils
 lfs_LDADD := liblustreapi.la -lz
 lfs_LDADD += $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
 lfs_DEPENDENCIES := liblustreapi.la
@@ -90,20 +95,23 @@ EXT2FSLIB =
 endif
 
 llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
-llverdev_LDADD := $(EXT2FSLIB) $(blkid_LIBS)
 
 liblustreapi_la_SOURCES = liblustreapi.c liblustreapi_hsm.c \
 			  liblustreapi_nodemap.c lustreapi_internal.h \
 			  liblustreapi_json.c liblustreapi_layout.c \
 			  liblustreapi_lease.c liblustreapi_util.c \
 			  liblustreapi_kernelconn.c liblustreapi_param.c \
-			  liblustreapi_mirror.c \
+			  liblustreapi_mirror.c liblustreapi_fid.c \
 			  liblustreapi_ladvise.c liblustreapi_chlg.c \
-			  liblustreapi_heat.c liblustreapi_pcc.c
+			  liblustreapi_heat.c liblustreapi_pcc.c \
+			  liblustreapi_lseek.c
 liblustreapi_la_LDFLAGS = $(LIBREADLINE) -version-info 1:0:0 \
 			  -Wl,--version-script=liblustreapi.map
 liblustreapi_la_LIBADD = $(top_builddir)/libcfs/libcfs/libcfs.la
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lustre.pc
+
 if UTILS
 LIB_TARGETS =
 if PLUGINS
@@ -134,6 +142,13 @@ llog_reader_DEPENDENCIES := liblustreapi.la
 
 lr_reader_SOURCES = lr_reader.c
 
+ofd_access_log_reader_SOURCES = \
+	lstddef.h \
+	ofd_access_batch.c \
+	ofd_access_batch.h \
+	ofd_access_log_reader.c
+ofd_access_log_reader_LDADD := -lpthread
+
 if UTILS
 
 PLUGIN_LIB =
@@ -141,6 +156,8 @@ if PLUGINS
 MNTMODLDFLAGS := -rdynamic
 MNTMODLIBS := -ldl
 MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
+else
+MNTMODLIBS :=
 endif # PLUGINS
 
 if ZFS_ENABLED
@@ -158,7 +175,7 @@ libmount_utils_zfs.la : libmount_utils_zfs.a
 			 $(MNTMODLIBS) $(ZFS_LIBZFS_LIBS)
 else
 MNTMODLDFLAGS := $(ZFS_LIBZFS_LDFLAGS)
-MNTMODLIBS := $(ZFS_LIBZFS_LIBS)
+MNTMODLIBS += $(ZFS_LIBZFS_LIBS)
 PLUGIN_LIB += libmount_utils_zfs.a
 endif # PLUGINS
 endif # ZFS_ENABLED
@@ -167,7 +184,7 @@ if LDISKFS_ENABLED
 noinst_LIBRARIES += libmount_utils_ldiskfs.a
 
 libmount_utils_ldiskfs_a_SOURCES = libmount_utils_ldiskfs.c
-libmount_utils_ldiskfs_a_CPPFLAGS := $(SELINUX)
+libmount_utils_ldiskfs_a_CPPFLAGS :=
 
 if PLUGINS
 lib_LTLIBRARIES += libmount_utils_ldiskfs.la
@@ -175,8 +192,9 @@ libmount_utils_ldiskfs.la : libmount_utils_ldiskfs.a
 	$(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic \
 			 -o mount_osd_ldiskfs.so \
 			 `$(AR) -t libmount_utils_ldiskfs.a` \
-			 $(MNTMODLIBS) $(SELINUX)
+			 $(MNTMODLIBS) -lext2fs
 else
+MNTMODLIBS += -lext2fs
 PLUGIN_LIB += libmount_utils_ldiskfs.a
 endif # PLUGINS
 endif # LDISKFS_ENABLED
@@ -186,6 +204,10 @@ mount_lustre_CPPFLAGS := ${MNTMODCFLAGS}
 mount_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
 mount_lustre_LDADD    := $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB) \
 			 $(top_builddir)/libcfs/libcfs/libcfs.la $(MNTMODLIBS)
+mount_lustre_tgt_SOURCES = ${mount_lustre_SOURCES}
+mount_lustre_tgt_CPPFLAGS = ${mount_lustre_CPPFLAGS}
+mount_lustre_tgt_LDFLAGS = ${mount_lustre_LDFLAGS}
+mount_lustre_tgt_LDADD = ${mount_lustre_LDADD}
 
 mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 mkfs_lustre_CPPFLAGS := -UTUNEFS ${MNTMODCFLAGS}
@@ -202,11 +224,15 @@ l_tunedisk_CPPFLAGS := ${MNTMODCFLAGS}
 l_tunedisk_LDFLAGS  := ${MNTMODLDFLAGS}
 l_tunedisk_LDADD    := $(mount_lustre_LDADD)
 
+l_foreign_symlink_SOURCES = l_foreign_symlink.c
+l_foreign_symlink_LDADD := $(top_builddir)/libcfs/libcfs/libcfs.la
+l_foreign_symlink_DEPENDENCIES := $(top_builddir)/libcfs/libcfs/libcfs.la
+
 l_getidentity_SOURCES = l_getidentity.c
 l_getidentity_LDADD := $(top_builddir)/libcfs/libcfs/libcfs.la
 l_getidentity_DEPENDENCIES := $(top_builddir)/libcfs/libcfs/libcfs.la
 
-lhsmtool_posix_SOURCES = lhsmtool_posix.c
+lhsmtool_posix_SOURCES = lhsmtool_posix.c pid_file.c pid_file.h
 lhsmtool_posix_LDADD := liblustreapi.la $(PTHREAD_LIBS)
 lhsmtool_posix_DEPENDENCIES := liblustreapi.la