lsfd: move the source code to new ./lsfd-cmd directory

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

19 files changed, 32 insertions, 46 deletions

diff --git a/Makefile.am b/Makefile.am
index 50ab8d0afe..01a35d15c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,6 +118,7 @@ include login-utils/Makemodule.am
 include sys-utils/Makemodule.am
 include misc-utils/Makemodule.am
 include disk-utils/Makemodule.am
+include lsfd-cmd/Makemodule.am
 
 include pam_lastlog2/Makemodule.am
 include bash-completion/Makemodule.am
diff --git a/lsfd-cmd/Makemodule.am b/lsfd-cmd/Makemodule.am
new file mode 100644
index 0000000000..577a780f5e
--- /dev/null
+++ b/lsfd-cmd/Makemodule.am
@@ -0,0 +1,24 @@
+if BUILD_LSFD
+
+lsfd-cmd/file.c: errnos.h
+
+bin_PROGRAMS += lsfd
+MANPAGES += lsfd-cmd/lsfd.1
+dist_noinst_DATA += lsfd-cmd/lsfd.1.adoc
+lsfd_SOURCES = \
+	lsfd-cmd/lsfd.c \
+	lsfd-cmd/lsfd.h \
+	lsfd-cmd/decode-file-flags.c \
+	lsfd-cmd/file.c \
+	lsfd-cmd/cdev.c \
+	lsfd-cmd/bdev.c \
+	lsfd-cmd/sock.c \
+	lsfd-cmd/sock.h \
+	lsfd-cmd/sock-xinfo.c \
+	lsfd-cmd/unkn.c \
+	lsfd-cmd/fifo.c \
+	lsfd-cmd/pidfd.h \
+	lsfd-cmd/pidfd.c
+lsfd_LDADD = $(LDADD) $(MQ_LIBS) libsmartcols.la libcommon.la
+lsfd_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+endif
diff --git a/misc-utils/lsfd-bdev.c b/lsfd-cmd/bdev.c
index b61fdbbf4c..b61fdbbf4c 100644
--- a/misc-utils/lsfd-bdev.c
+++ b/lsfd-cmd/bdev.c
diff --git a/misc-utils/lsfd-cdev.c b/lsfd-cmd/cdev.c
index cbb2d051bb..cbb2d051bb 100644
--- a/misc-utils/lsfd-cdev.c
+++ b/lsfd-cmd/cdev.c
diff --git a/misc-utils/lsfd-decode-file-flags.c b/lsfd-cmd/decode-file-flags.c
index bd87c7d794..bd87c7d794 100644
--- a/misc-utils/lsfd-decode-file-flags.c
+++ b/lsfd-cmd/decode-file-flags.c
diff --git a/misc-utils/lsfd-fifo.c b/lsfd-cmd/fifo.c
index b78e6d4875..b78e6d4875 100644
--- a/misc-utils/lsfd-fifo.c
+++ b/lsfd-cmd/fifo.c
diff --git a/misc-utils/lsfd-file.c b/lsfd-cmd/file.c
index 35eabb3e45..25477cf2f1 100644
--- a/misc-utils/lsfd-file.c
+++ b/lsfd-cmd/file.c
@@ -45,7 +45,7 @@
 #include "procfs.h"
 
 #include "lsfd.h"
-#include "lsfd-pidfd.h"
+#include "pidfd.h"
 #include "pidfd-utils.h"
 
 static size_t pagesize;
diff --git a/misc-utils/lsfd.1.adoc b/lsfd-cmd/lsfd.1.adoc
index 05cc9e9aee..05cc9e9aee 100644
--- a/misc-utils/lsfd.1.adoc
+++ b/lsfd-cmd/lsfd.1.adoc
diff --git a/misc-utils/lsfd.c b/lsfd-cmd/lsfd.c
index 09503d0ab7..09503d0ab7 100644
--- a/misc-utils/lsfd.c
+++ b/lsfd-cmd/lsfd.c
diff --git a/misc-utils/lsfd.h b/lsfd-cmd/lsfd.h
index f70f53cc15..f70f53cc15 100644
--- a/misc-utils/lsfd.h
+++ b/lsfd-cmd/lsfd.h
diff --git a/misc-utils/lsfd-pidfd.c b/lsfd-cmd/pidfd.c
index 430a8028dc..c5f9d3de6c 100644
--- a/misc-utils/lsfd-pidfd.c
+++ b/lsfd-cmd/pidfd.c
@@ -27,7 +27,7 @@
 #include "xalloc.h"
 
 #include "lsfd.h"
-#include "lsfd-pidfd.h"
+#include "pidfd.h"
 
 int pidfd_handle_fdinfo(struct pidfd_data *data, const char *key,
 			const char *value)
diff --git a/misc-utils/lsfd-pidfd.h b/lsfd-cmd/pidfd.h
index 2f65d3b3f3..2f65d3b3f3 100644
--- a/misc-utils/lsfd-pidfd.h
+++ b/lsfd-cmd/pidfd.h
diff --git a/misc-utils/lsfd-sock-xinfo.c b/lsfd-cmd/sock-xinfo.c
index 9422d4b98c..c182c5efbb 100644
--- a/misc-utils/lsfd-sock-xinfo.c
+++ b/lsfd-cmd/sock-xinfo.c
@@ -42,7 +42,7 @@
 #include "bitops.h"
 
 #include "lsfd.h"
-#include "lsfd-sock.h"
+#include "sock.h"
 
 static void load_xinfo_from_proc_icmp(ino_t netns_inode, enum sysfs_byteorder byteorder);
 static void load_xinfo_from_proc_icmp6(ino_t netns_inode, enum sysfs_byteorder byteorder);
diff --git a/misc-utils/lsfd-sock.c b/lsfd-cmd/sock.c
index 4c75e6eaf9..d296ceb4c2 100644
--- a/misc-utils/lsfd-sock.c
+++ b/lsfd-cmd/sock.c
@@ -23,7 +23,7 @@
 #include <sys/xattr.h>
 
 #include "lsfd.h"
-#include "lsfd-sock.h"
+#include "sock.h"
 
 static void attach_sock_xinfo(struct file *file)
 {
diff --git a/misc-utils/lsfd-sock.h b/lsfd-cmd/sock.h
index 50360b7035..50360b7035 100644
--- a/misc-utils/lsfd-sock.h
+++ b/lsfd-cmd/sock.h
diff --git a/misc-utils/lsfd-unkn.c b/lsfd-cmd/unkn.c
index 8e257f479b..fa8a2bd559 100644
--- a/misc-utils/lsfd-unkn.c
+++ b/lsfd-cmd/unkn.c
@@ -28,7 +28,7 @@
 #include "timeutils.h"
 
 #include "lsfd.h"
-#include "lsfd-pidfd.h"
+#include "pidfd.h"
 
 #define offsetofend(TYPE, MEMBER)				\
 	(offsetof(TYPE, MEMBER)	+ sizeof_member(TYPE, MEMBER))
diff --git a/meson.build b/meson.build
index 99126f7aad..d164235bab 100644
--- a/meson.build
+++ b/meson.build
@@ -982,6 +982,7 @@ subdir('disk-utils')
 subdir('misc-utils')
 subdir('text-utils')
 subdir('term-utils')
+subdir('lsfd-cmd')
 subdir('po')
 
 includes = [dir_include,
@@ -2792,7 +2793,7 @@ exe = executable(
   build_by_default : opt)
 if opt and not is_disabler(exe)
   exes += exe
-  manadocs += ['misc-utils/lsfd.1.adoc']
+  manadocs += ['lsfd-cmd/lsfd.1.adoc']
 endif
 
 exe = executable(
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 7622a5d7be..edff806a2d 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -280,31 +280,6 @@ hardlink_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 hardlink_CFLAGS = $(AM_CFLAGS)
 endif
 
-if BUILD_LSFD
-
-misc-utils/lsfd-file.c: errnos.h
-
-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 \
-	misc-utils/lsfd-decode-file-flags.c \
-	misc-utils/lsfd-file.c \
-	misc-utils/lsfd-cdev.c \
-	misc-utils/lsfd-bdev.c \
-	misc-utils/lsfd-sock.c \
-	misc-utils/lsfd-sock.h \
-	misc-utils/lsfd-sock-xinfo.c \
-	misc-utils/lsfd-unkn.c \
-	misc-utils/lsfd-fifo.c \
-	misc-utils/lsfd-pidfd.h \
-	misc-utils/lsfd-pidfd.c
-lsfd_LDADD = $(LDADD) $(MQ_LIBS) libsmartcols.la libcommon.la
-lsfd_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
-endif
-
 if BUILD_PIPESZ
 bin_PROGRAMS += pipesz
 MANPAGES += misc-utils/pipesz.1
diff --git a/misc-utils/meson.build b/misc-utils/meson.build
index 68ea9777ec..2955408a76 100644
--- a/misc-utils/meson.build
+++ b/misc-utils/meson.build
@@ -44,21 +44,6 @@ lsblk_sources = files(
   'lsblk.h',
 )
 
-lsfd_sources = files (
-  'lsfd.c',
-  'lsfd.h',
-  'lsfd-decode-file-flags.c',
-  'lsfd-file.c',
-  'lsfd-cdev.c',
-  'lsfd-bdev.c',
-  'lsfd-sock.c',
-  'lsfd-sock.h',
-  'lsfd-sock-xinfo.c',
-  'lsfd-unkn.c',
-  'lsfd-fifo.c',
-  'lsfd-pidfd.c',
-)
-
 uuidgen_sources = files(
   'uuidgen.c',
 )