X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=8704f5ba5fda8ba2514a960b42dab71d7a0475ab;hp=5fd9d946d1bd558dbf29b491bf47d7a1c6bc1f79;hb=510aea4a37ea26769be5946ca93a4576a1dd4095;hpb=2ef6910ff42c9bc2a52236ac045c1be5b2e13ea2

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 5fd9d94..8704f5b 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 := -no-install
+	      -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 $(UTILS_CFLAGS)
+AM_LDFLAGS := $(UTILS_LDFLAGS)
 
 if TESTS
 EXTRA_PROGRAMS = wirecheck
@@ -23,7 +23,7 @@ GSSLIB =
 endif
 
 # mount only finds helpers in /sbin
-rootsbin_PROGRAMS = mount.lustre
+rootsbin_PROGRAMS = mount.lustre mount.lustre_tgt
 bin_SCRIPTS   = llstat llobdstat plot-llstat
 bin_PROGRAMS  = lfs
 sbin_SCRIPTS  = ldlm_debug_upcall
@@ -42,6 +42,12 @@ if LIBPTHREAD
 sbin_PROGRAMS += lhsmtool_posix
 endif
 
+if SELINUX
+if GETSEPOL
+sbin_PROGRAMS += l_getsepol
+endif
+endif
+
 lib_LIBRARIES =
 noinst_LIBRARIES =
 if LDISKFS_ENABLED
@@ -57,7 +63,7 @@ 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
@@ -83,23 +89,16 @@ E2PLIB =
 EXT2FSLIB =
 endif
 
-if BLKID
-BLKIDLIB = -lblkid -luuid
-else
-BLKIDLIB =
-endif
-
 llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
 
-llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
-
 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_ladvise.c liblustreapi_chlg.c
+			  liblustreapi_ladvise.c liblustreapi_chlg.c \
+			  liblustreapi_heat.c liblustreapi_pcc.c
 liblustreapi_la_LDFLAGS = $(LIBREADLINE) -version-info 1:0:0 \
 			  -Wl,--version-script=liblustreapi.map
 liblustreapi_la_LIBADD = $(top_builddir)/libcfs/libcfs/libcfs.la
@@ -186,6 +185,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}
@@ -210,6 +213,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)\""