X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=7726f27a4d8d82516751f453a0c17de6a2640ac8;hb=5270583ae6e436e9e7ae0199312e7f50365744af;hp=43ca5754d96402925cefee637c966c84ab04c712;hpb=defbc7ddd9c3b1ffc28f123316217e30e210127b;p=fs%2Flustre-release.git

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 43ca575..7726f27 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,8 +1,8 @@
 # Administration utilities Makefile
 
 AM_CFLAGS  := -fPIC -D_GNU_SOURCE \
-	      -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1
-AM_LDFLAGS := -L$(top_builddir)/lnet/utils
+	      -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 $(UTILS_CFLAGS)
+AM_LDFLAGS := $(UTILS_LDFLAGS)
 
 if TESTS
 EXTRA_PROGRAMS = wirecheck
@@ -27,7 +27,8 @@ rootsbin_PROGRAMS = mount.lustre
 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
+sbin_PROGRAMS = lctl l_getidentity llverfs lustre_rsync ll_decode_linkea \
+		llsom_sync
 
 if TESTS
 sbin_PROGRAMS += wiretest
@@ -35,12 +36,18 @@ endif # TESTS
 
 if SERVER
 sbin_PROGRAMS += mkfs.lustre tunefs.lustre llverdev lr_reader lshowmount \
-		 ll_decode_filter_fid llog_reader
+		 ll_decode_filter_fid llog_reader l_tunedisk
 endif
 if LIBPTHREAD
 sbin_PROGRAMS += lhsmtool_posix
 endif
 
+if SELINUX
+if GETSEPOL
+sbin_PROGRAMS += l_getsepol
+endif
+endif
+
 lib_LIBRARIES =
 noinst_LIBRARIES =
 if LDISKFS_ENABLED
@@ -56,17 +63,21 @@ lctl_SOURCES = portals.c debug.c obd.c lustre_cfg.c lctl.c obdctl.h
 if SERVER
 lctl_SOURCES += lustre_lfsck.c lsnapshot.c
 endif
-lctl_LDADD :=  liblustreapi.la $(PTHREAD_LIBS)
+lctl_LDADD :=  liblustreapi.la $(PTHREAD_LIBS) -lyaml
 lctl_DEPENDENCIES := liblustreapi.la
 
 lfs_SOURCES = lfs.c lfs_project.c lfs_project.h
 lfs_LDADD := liblustreapi.la -lz
+lfs_LDADD += $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
 lfs_DEPENDENCIES := liblustreapi.la
 
 lustre_rsync_SOURCES = lustre_rsync.c lustre_rsync.h callvpe.c callvpe.h
 lustre_rsync_LDADD :=  liblustreapi.la $(PTHREAD_LIBS)
 lustre_rsync_DEPENDENCIES := liblustreapi.la
 
+llsom_sync_LDADD := liblustreapi.la
+llsom_sync_DEPENDENCIES := liblustreapi.la
+
 lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
 lshowmount_LDADD :=  liblustreapi.la
 
@@ -79,7 +90,7 @@ EXT2FSLIB =
 endif
 
 if BLKID
-BLKIDLIB = -lblkid
+BLKIDLIB = -lblkid -luuid
 else
 BLKIDLIB =
 endif
@@ -94,7 +105,8 @@ liblustreapi_la_SOURCES = liblustreapi.c liblustreapi_hsm.c \
 			  liblustreapi_lease.c liblustreapi_util.c \
 			  liblustreapi_kernelconn.c liblustreapi_param.c \
 			  liblustreapi_mirror.c \
-			  liblustreapi_ladvise.c liblustreapi_chlg.c
+			  liblustreapi_ladvise.c liblustreapi_chlg.c \
+			  liblustreapi_heat.c
 liblustreapi_la_LDFLAGS = $(LIBREADLINE) -version-info 1:0:0 \
 			  -Wl,--version-script=liblustreapi.map
 liblustreapi_la_LIBADD = $(top_builddir)/libcfs/libcfs/libcfs.la
@@ -133,7 +145,8 @@ if UTILS
 
 PLUGIN_LIB =
 if PLUGINS
-MNTMODLDFLAGS := -rdynamic -ldl
+MNTMODLDFLAGS := -rdynamic
+MNTMODLIBS := -ldl
 MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
 endif # PLUGINS
 
@@ -148,9 +161,11 @@ lib_LTLIBRARIES += libmount_utils_zfs.la
 libmount_utils_zfs.la : libmount_utils_zfs.a
 	$(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic -pthread \
 			 $(ZFS_LIBZFS_LDFLAGS) -o mount_osd_zfs.so \
-			 `$(AR) -t libmount_utils_zfs.a`
+			 `$(AR) -t libmount_utils_zfs.a` \
+			 $(MNTMODLIBS) $(ZFS_LIBZFS_LIBS)
 else
 MNTMODLDFLAGS := $(ZFS_LIBZFS_LDFLAGS)
+MNTMODLIBS := $(ZFS_LIBZFS_LIBS)
 PLUGIN_LIB += libmount_utils_zfs.a
 endif # PLUGINS
 endif # ZFS_ENABLED
@@ -165,8 +180,9 @@ if PLUGINS
 lib_LTLIBRARIES += libmount_utils_ldiskfs.la
 libmount_utils_ldiskfs.la : libmount_utils_ldiskfs.a
 	$(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic \
-			 $(SELINUX) -o mount_osd_ldiskfs.so \
-			 `$(AR) -t libmount_utils_ldiskfs.a`
+			 -o mount_osd_ldiskfs.so \
+			 `$(AR) -t libmount_utils_ldiskfs.a` \
+			 $(MNTMODLIBS) $(SELINUX)
 else
 PLUGIN_LIB += libmount_utils_ldiskfs.a
 endif # PLUGINS
@@ -175,8 +191,8 @@ endif # LDISKFS_ENABLED
 mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 mount_lustre_CPPFLAGS := ${MNTMODCFLAGS}
 mount_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
-mount_lustre_LDADD    := $(top_builddir)/libcfs/libcfs/libcfs.la \
-			 $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB)
+mount_lustre_LDADD    := $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB) \
+			 $(top_builddir)/libcfs/libcfs/libcfs.la $(MNTMODLIBS)
 
 mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 mkfs_lustre_CPPFLAGS := -UTUNEFS ${MNTMODCFLAGS}
@@ -188,6 +204,11 @@ tunefs_lustre_CPPFLAGS := -DTUNEFS ${MNTMODCFLAGS}
 tunefs_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
 tunefs_lustre_LDADD    := $(mkfs_lustre_LDADD)
 
+l_tunedisk_SOURCES = l_tunedisk.c mount_utils.c mount_utils.h $(GSSSRC)
+l_tunedisk_CPPFLAGS := ${MNTMODCFLAGS}
+l_tunedisk_LDFLAGS  := ${MNTMODLDFLAGS}
+l_tunedisk_LDADD    := $(mount_lustre_LDADD)
+
 l_getidentity_SOURCES = l_getidentity.c
 l_getidentity_LDADD := $(top_builddir)/libcfs/libcfs/libcfs.la
 l_getidentity_DEPENDENCIES := $(top_builddir)/libcfs/libcfs/libcfs.la
@@ -196,6 +217,10 @@ lhsmtool_posix_SOURCES = lhsmtool_posix.c
 lhsmtool_posix_LDADD := liblustreapi.la $(PTHREAD_LIBS)
 lhsmtool_posix_DEPENDENCIES := liblustreapi.la
 
+l_getsepol_SOURCES = l_getsepol.c
+l_getsepol_LDADD := liblustreapi.la -lcrypto $(SELINUX)
+l_getsepol_DEPENDENCIES := liblustreapi.la
+
 wirecheck_SOURCES = wirecheck.c
 wirecheck_CPPFLAGS := -DCC="\"$(CC)\""