LU-9897 build: use pkgconf for detecting libblkid

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

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 5fd9d94..44ae523 100644 (file)
--- 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
@@ -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,15 +89,8 @@ E2PLIB =
 EXT2FSLIB =
 endif
 
-if BLKID
-BLKIDLIB = -lblkid -luuid
-else
-BLKIDLIB =
-endif
-
 llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
-
-llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
+llverdev_LDADD := $(EXT2FSLIB) $(blkid_LIBS)
 
 liblustreapi_la_SOURCES = liblustreapi.c liblustreapi_hsm.c \
                          liblustreapi_nodemap.c lustreapi_internal.h \
@@ -99,7 +98,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_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
@@ -210,6 +210,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)\""