build-sys: cleanup lsfd related stuff

- add lsfd to meson.build
- add Masatake to AUTHORS
- add me to lsfd.c header and man page

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/AUTHORS b/AUTHORS
index 0488b703148993dbe7968554922e1e0a3ce5fdfa..5c76a19b306721aa7b0b9c193f23cc878a5f02f4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,6 +43,7 @@ AUTHORS (merged projects & commands):
       lscpu:           Cai Qian <qcai@redhat.com>
       lsblk:           Milan Broz <mbroz@redhat.com>
                        Karel Zak <kzak@redhat.com>
+      lsfd:            Masatake YAMATO <yamato@redhat.com>
       lsipc:           Ondrej Oprala <ooprala@redhat.com>
                        Karel Zak <kzak@redhat.com>
       lslocks:         Davidlohr Bueso <dave@gnu.org>

diff --git a/meson.build b/meson.build
index f315cbb171928f7158609e9447e68f76b74f3e2f..378c3431a3596fa27ee09f40e314ff3ed2bb2607 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2335,6 +2335,19 @@ if not is_disabler(exe)
   manadocs += ['misc-utils/lsblk.8.adoc']
 endif
 
+exe = executable(
+  'lsfd',
+  lsfd_sources,
+  include_directories : includes,
+  link_with : [lib_common,
+               lib_smartcols],
+  install_dir : usrbin_exec_dir,
+  install : true)
+if not is_disabler(exe)
+  exes += exe
+  manadocs += ['misc-utils/lsfd.1.adoc']
+endif
+
 exe = executable(
   'uuidgen',
   uuidgen_sources,

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 17f988910eac84ea0becb04f9475df8f002b7de5..abfddf3b39437d5258e9661964756bb6d960bd82 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -249,6 +249,7 @@ endif
 if BUILD_LSFD
 bin_PROGRAMS += lsfd
 MANPAGES += misc-utils/lsfd.1
+dist_noinst_DATA += misc-utils/lsfd.1.adoc
 lsfd_SOURCES = \
        misc-utils/lsfd.c \
        misc-utils/lsfd.h \

diff --git a/misc-utils/lsfd.1.adoc b/misc-utils/lsfd.1.adoc
index b168ca3d59c1be2d8bbc72c913f4243fe9b31fa0..0b796ad75baa244f72ebaf05c23d0c45be127502 100644 (file)
--- a/misc-utils/lsfd.1.adoc
+++ b/misc-utils/lsfd.1.adoc
@@ -152,7 +152,8 @@ The *lsfd* command is part of the util-linux package since v2.38.
 
 == AUTHORS
 
-mailto:yamato@redhat.com[Masatake YAMATO]
+mailto:yamato@redhat.com[Masatake YAMATO],
+mailto:kzak@redhat.com[Karel Zak]
 
 == SEE ALSO
 

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 8ab9f147d11463fe3158515b16fa39cac0cbe132..77019489f7876e144ce722ba08ed568267cf557d 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2021 Red Hat, Inc. All rights reserved.
  * Written by Masatake YAMATO <yamato@redhat.com>
+ *            Karel Zak <kzak@redhat.com>
  *
  * Very generally based on lsof(8) by Victor A. Abell <abe@purdue.edu>
  * It supports multiple OSes. lsfd specializes to Linux.

diff --git a/misc-utils/meson.build b/misc-utils/meson.build
index 71e1f4d836a89fc677de463be152864a67062189..bff8947b05f3058e73ce37470d4fd25f6a2c56ee 100644 (file)
--- a/misc-utils/meson.build
+++ b/misc-utils/meson.build
@@ -39,6 +39,19 @@ lsblk_sources = files(
   'lsblk.h',
 )
 
+lsfd_sources = files (
+  'lsfd.c',
+  'lsfd.h',
+  'lsfd-filter.h',
+  'lsfd-filter.c',
+  'lsfd-file.c',
+  'lsfd-cdev.c',
+  'lsfd-bdev.c',
+  'lsfd-sock.c',
+  'lsfd-unkn.c',
+  'lsfd-fifo.c',
+)
+
 uuidgen_sources = files(
   'uuidgen.c',
 )