lsblk: move source files to dedicated lsblk-cmd/ directory

Move all lsblk source files from misc-utils/ to a dedicated
lsblk-cmd/ directory, following the pattern established by lsfd-cmd/.
Update both autotools and meson build systems accordingly.

Closes: https://github.com/util-linux/util-linux/issues/4146
Signed-off-by: Alessandro Ratti <alessandro@0x65c.net>

diff --git a/Makefile.am b/Makefile.am
index 02db4061e6bd24cfb21cb0aadebead95270da0cc..d21aa441e3d66ab1e134b0d51fa5dfca3c0437d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,6 +117,7 @@ include sys-utils/Makemodule.am
 include misc-utils/Makemodule.am
 include disk-utils/Makemodule.am
 include lsfd-cmd/Makemodule.am
+include lsblk-cmd/Makemodule.am
 
 include pam_lastlog2/Makemodule.am
 include bash-completion/Makemodule.am
@@ -147,6 +148,7 @@ EXTRA_DIST += \
        libuuid/meson.build \
        login-utils/meson.build \
        lsfd-cmd/meson.build \
+       lsblk-cmd/meson.build \
        man-common/meson.build \
        misc-utils/meson.build \
        pam_lastlog2/man/meson.build \

diff --git a/lsblk-cmd/Makemodule.am b/lsblk-cmd/Makemodule.am
new file mode 100644 (file)
index 0000000..2cba686
--- /dev/null
+++ b/lsblk-cmd/Makemodule.am
@@ -0,0 +1,18 @@
+if BUILD_LSBLK
+bin_PROGRAMS += lsblk
+MANPAGES += lsblk-cmd/lsblk.8
+dist_noinst_DATA += lsblk-cmd/lsblk.8.adoc
+lsblk_SOURCES = \
+       lsblk-cmd/lsblk.c \
+       lsblk-cmd/mnt.c \
+       lsblk-cmd/properties.c \
+       lsblk-cmd/devtree.c \
+       lsblk-cmd/lsblk.h
+lsblk_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la \
+               libsmartcols.la libtcolors.la
+lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir)
+if HAVE_UDEV
+lsblk_LDADD += -ludev
+endif
+endif # BUILD_LSBLK
+

diff --git a/misc-utils/lsblk-devtree.c b/lsblk-cmd/devtree.c
similarity index 100%
rename from misc-utils/lsblk-devtree.c
rename to lsblk-cmd/devtree.c

diff --git a/misc-utils/lsblk.8.adoc b/lsblk-cmd/lsblk.8.adoc
similarity index 100%
rename from misc-utils/lsblk.8.adoc
rename to lsblk-cmd/lsblk.8.adoc

diff --git a/misc-utils/lsblk.c b/lsblk-cmd/lsblk.c
similarity index 100%
rename from misc-utils/lsblk.c
rename to lsblk-cmd/lsblk.c

diff --git a/misc-utils/lsblk.h b/lsblk-cmd/lsblk.h
similarity index 100%
rename from misc-utils/lsblk.h
rename to lsblk-cmd/lsblk.h

diff --git a/lsblk-cmd/meson.build b/lsblk-cmd/meson.build
new file mode 100644 (file)
index 0000000..439fe4e
--- /dev/null
+++ b/lsblk-cmd/meson.build
@@ -0,0 +1,8 @@
+lsblk_sources = files(
+  'lsblk.c',
+  'mnt.c',
+  'properties.c',
+  'devtree.c',
+  'lsblk.h',
+)
+lsblk_manadocs = files('lsblk.8.adoc')

diff --git a/misc-utils/lsblk-mnt.c b/lsblk-cmd/mnt.c
similarity index 100%
rename from misc-utils/lsblk-mnt.c
rename to lsblk-cmd/mnt.c

diff --git a/misc-utils/lsblk-properties.c b/lsblk-cmd/properties.c
similarity index 100%
rename from misc-utils/lsblk-properties.c
rename to lsblk-cmd/properties.c

diff --git a/meson.build b/meson.build
index 0012894c69da76735ad80349ad0547e1decedc17..48070b741bd0a79f6d2e2c85f126b2ae5ce426cd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1049,6 +1049,7 @@ subdir('schedutils')
 subdir('text-utils')
 subdir('term-utils')
 subdir('lsfd-cmd')
+subdir('lsblk-cmd')
 subdir('po')
 
 includes = [dir_include,

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 27abeb3cad521ba5bae9a23630bf32f139d8c6b0..21dab303ba46c5100cc5068cec9173933bf1f0ce 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -89,24 +89,6 @@ lslocks_SOURCES = misc-utils/lslocks.c
 lslocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir)
 endif
 
-if BUILD_LSBLK
-bin_PROGRAMS += lsblk
-MANPAGES += misc-utils/lsblk.8
-dist_noinst_DATA += misc-utils/lsblk.8.adoc
-lsblk_SOURCES = \
-       misc-utils/lsblk.c \
-       misc-utils/lsblk-mnt.c \
-       misc-utils/lsblk-properties.c \
-       misc-utils/lsblk-devtree.c \
-       misc-utils/lsblk.h
-lsblk_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la \
-               libsmartcols.la libtcolors.la
-lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir)
-if HAVE_UDEV
-lsblk_LDADD += -ludev
-endif
-endif # BUILD_LSBLK
-
 if BUILD_LIBLASTLOG2
 usrbin_exec_PROGRAMS += lastlog2
 MANPAGES += misc-utils/lastlog2.8

diff --git a/misc-utils/meson.build b/misc-utils/meson.build
index 290bfcf9de708c16a629e3badfa69a7964f6ff6f..6a77d8cc3a0588a34ec0b616f3a0bff449be6ab3 100644 (file)
--- a/misc-utils/meson.build
+++ b/misc-utils/meson.build
@@ -48,15 +48,6 @@ lslocks_sources = files(
 )
 lslocks_manadocs = files('lslocks.8.adoc')
 
-lsblk_sources = files(
-  'lsblk.c',
-  'lsblk-mnt.c',
-  'lsblk-properties.c',
-  'lsblk-devtree.c',
-  'lsblk.h',
-)
-lsblk_manadocs = files('lsblk.8.adoc')
-
 uuidgen_sources = files(
   'uuidgen.c',
 )

diff --git a/po-man/po4a.cfg b/po-man/po4a.cfg
index 9a372d0f71b4d00b59b2fd86f3a1d9d04a3feadb..38af1fef3dcd8d631fd83f1d3e82d47d2ffa225d 100644 (file)
--- a/po-man/po4a.cfg
+++ b/po-man/po4a.cfg
@@ -64,6 +64,7 @@
 [type:asciidoc] ../login-utils/vipw.8.adoc        $lang:$lang/vipw.8.adoc
 
 [type:asciidoc] ../lsfd-cmd/lsfd.1.adoc           $lang:$lang/lsfd.1.adoc
+[type:asciidoc] ../lsblk-cmd/lsblk.8.adoc         $lang:$lang/lsblk.8.adoc
 
 [type:asciidoc] ../misc-utils/blkid.8.adoc         $lang:$lang/blkid.8.adoc
 [type:asciidoc] ../misc-utils/cal.1.adoc           $lang:$lang/cal.1.adoc
@@ -81,7 +82,6 @@
 [type:asciidoc] ../misc-utils/lastlog2.8.adoc      $lang:$lang/lastlog2.8.adoc
 [type:asciidoc] ../misc-utils/logger.1.adoc        $lang:$lang/logger.1.adoc
 [type:asciidoc] ../misc-utils/look.1.adoc          $lang:$lang/look.1.adoc
-[type:asciidoc] ../misc-utils/lsblk.8.adoc         $lang:$lang/lsblk.8.adoc
 [type:asciidoc] ../misc-utils/lsclocks.1.adoc      $lang:$lang/lsclocks.1.adoc
 [type:asciidoc] ../misc-utils/lslocks.8.adoc       $lang:$lang/lslocks.8.adoc
 [type:asciidoc] ../misc-utils/mcookie.1.adoc       $lang:$lang/mcookie.1.adoc