summaryrefslogtreecommitdiff
path: root/sys-utils/Makemodule.am
diff options
context:
space:
mode:
Diffstat (limited to 'sys-utils/Makemodule.am')
-rw-r--r--sys-utils/Makemodule.am21
1 files changed, 14 insertions, 7 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 4139fcf65..93a2c8d92 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -47,6 +47,14 @@ cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h
cytune_LDADD = $(LDADD) libcommon.la
endif
+if BUILD_FSTRIM
+sbin_PROGRAMS += fstrim
+dist_man_MANS += sys-utils/fstrim.8
+fstrim_SOURCES = sys-utils/fstrim.c
+fstrim_LDADD = $(LDADD) libcommon.la libmount.la
+fstrim_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
+endif
+
if LINUX
#
# Linux-only utils with no another dependencies. All another dependencies have
@@ -55,7 +63,7 @@ if LINUX
bin_PROGRAMS += dmesg
dist_man_MANS += sys-utils/dmesg.1
dmesg_SOURCES = sys-utils/dmesg.c
-dmesg_LDADD = $(LDADD) libcommon.la
+dmesg_LDADD = $(LDADD) libcommon.la -lrt
sbin_PROGRAMS += ctrlaltdel
dist_man_MANS += sys-utils/ctrlaltdel.8
@@ -65,11 +73,6 @@ sbin_PROGRAMS += fsfreeze
dist_man_MANS += sys-utils/fsfreeze.8
fsfreeze_SOURCES = sys-utils/fsfreeze.c
-sbin_PROGRAMS += fstrim
-dist_man_MANS += sys-utils/fstrim.8
-fstrim_SOURCES = sys-utils/fstrim.c
-fstrim_LDADD = $(LDADD) libcommon.la
-
sbin_PROGRAMS += blkdiscard
dist_man_MANS += sys-utils/blkdiscard.8
blkdiscard_SOURCES = sys-utils/blkdiscard.c
@@ -239,7 +242,10 @@ endif
if BUILD_LSCPU
usrbin_exec_PROGRAMS += lscpu
-lscpu_SOURCES = sys-utils/lscpu.c
+lscpu_SOURCES = \
+ sys-utils/lscpu.c \
+ sys-utils/lscpu.h \
+ sys-utils/lscpu-dmi.c
lscpu_LDADD = $(LDADD) libcommon.la
dist_man_MANS += sys-utils/lscpu.1
endif
@@ -290,6 +296,7 @@ usrbin_exec_PROGRAMS += unshare
dist_man_MANS += sys-utils/unshare.1
unshare_SOURCES = sys-utils/unshare.c
unshare_LDADD = $(LDADD) libcommon.la
+unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
endif
if BUILD_NSENTER