From 5663298c2c8f3b89be5626ca435b3fd1e5509823 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 2 Jul 2009 14:38:23 +0200 Subject: [PATCH] blkid: move to misc-utils/ directory The others utilities are in one of the top-level directories. That's confusing to have blkid(8) and findfs(8) in shlibs/ tree. Signed-off-by: Karel Zak --- configure.ac | 1 - misc-utils/.gitignore | 2 ++ misc-utils/Makefile.am | 17 +++++++++++++++++ {shlibs/blkid/bin => misc-utils}/blkid.8 | 0 {shlibs/blkid/bin => misc-utils}/blkid.c | 0 {shlibs/blkid/bin => misc-utils}/findfs.8 | 0 {shlibs/blkid/bin => misc-utils}/findfs.c | 0 shlibs/blkid/Makefile.am | 2 +- shlibs/blkid/bin/Makefile.am | 15 --------------- shlibs/blkid/bin/blkid.sh.in | 10 ---------- shlibs/blkid/bin/findfs.sh.in | 10 ---------- tests/commands.sh.in | 2 +- 12 files changed, 21 insertions(+), 38 deletions(-) rename {shlibs/blkid/bin => misc-utils}/blkid.8 (100%) rename {shlibs/blkid/bin => misc-utils}/blkid.c (100%) rename {shlibs/blkid/bin => misc-utils}/findfs.8 (100%) rename {shlibs/blkid/bin => misc-utils}/findfs.c (100%) delete mode 100644 shlibs/blkid/bin/Makefile.am delete mode 100644 shlibs/blkid/bin/blkid.sh.in delete mode 100644 shlibs/blkid/bin/findfs.sh.in diff --git a/configure.ac b/configure.ac index 6a870659..96eb68a0 100644 --- a/configure.ac +++ b/configure.ac @@ -911,7 +911,6 @@ mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile -shlibs/blkid/bin/Makefile shlibs/blkid/blkid.pc shlibs/blkid/Makefile shlibs/blkid/src/Makefile diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore index e58c9301..2242b920 100644 --- a/misc-utils/.gitignore +++ b/misc-utils/.gitignore @@ -14,3 +14,5 @@ kill write uuidgen uuidd +findfs +blkid diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 272ef75d..7c4561c4 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am EXTRA_DIST = README.flushb uuidd.rc bin_PROGRAMS = +sbin_PROGRAMS = usrsbinexec_PROGRAMS = usrbinexec_PROGRAMS = cal ddate logger look mcookie \ @@ -31,6 +32,22 @@ uuidd_CFLAGS = -I$(ul_libuuid_srcdir) endif endif +if BUILD_LIBBLKID +sbin_PROGRAMS += blkid findfs +dist_man_MANS += blkid.8 findfs.8 +blkid_LDADD = $(ul_libblkid_la) +blkid_CFLAGS = -I$(ul_libblkid_srcdir) +findfs_LDADD = $(ul_libblkid_la) +findfs_CFLAGS = -I$(ul_libblkid_srcdir) +if HAVE_STATIC_BLKID +sbin_PROGRAMS += blkid.static +blkid_static_SOURCES = $(blkid_SOURCES) +blkid_static_LDFLAGS = "-all-static" # libtool option +blkid_static_LDADD = $(ul_libblkid_la) +blkid_static_CFLAGS = -I$(ul_libblkid_srcdir) +endif +endif + if HAVE_TINFO cal_LDADD = -ltinfo @NCURSES_LIBS@ else diff --git a/shlibs/blkid/bin/blkid.8 b/misc-utils/blkid.8 similarity index 100% rename from shlibs/blkid/bin/blkid.8 rename to misc-utils/blkid.8 diff --git a/shlibs/blkid/bin/blkid.c b/misc-utils/blkid.c similarity index 100% rename from shlibs/blkid/bin/blkid.c rename to misc-utils/blkid.c diff --git a/shlibs/blkid/bin/findfs.8 b/misc-utils/findfs.8 similarity index 100% rename from shlibs/blkid/bin/findfs.8 rename to misc-utils/findfs.8 diff --git a/shlibs/blkid/bin/findfs.c b/misc-utils/findfs.c similarity index 100% rename from shlibs/blkid/bin/findfs.c rename to misc-utils/findfs.c diff --git a/shlibs/blkid/Makefile.am b/shlibs/blkid/Makefile.am index a27c8524..9c552bfd 100644 --- a/shlibs/blkid/Makefile.am +++ b/shlibs/blkid/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -SUBDIRS = src bin +SUBDIRS = src # pkg-config stuff pkgconfigdir = $(usrlibexecdir)/pkgconfig diff --git a/shlibs/blkid/bin/Makefile.am b/shlibs/blkid/bin/Makefile.am deleted file mode 100644 index ff992ace..00000000 --- a/shlibs/blkid/bin/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -AM_CPPFLAGS += -I$(ul_libblkid_srcdir) -AM_LDFLAGS += $(ul_libblkid_la) - -sbin_PROGRAMS = blkid findfs -dist_man_MANS = blkid.8 findfs.8 - -if HAVE_STATIC_BLKID -sbin_PROGRAMS += blkid.static -blkid_static_SOURCES = $(blkid_SOURCES) -blkid_static_LDFLAGS = "-all-static" # libtool option -blkid_static_LDADD = $(ul_libblkid_la) -blkid_static_CFLAGS = -I$(ul_libblkid_srcdir) -endif diff --git a/shlibs/blkid/bin/blkid.sh.in b/shlibs/blkid/bin/blkid.sh.in deleted file mode 100644 index 3e10add1..00000000 --- a/shlibs/blkid/bin/blkid.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# libtool? Don't ask! - -BLKIDDIR=@SRCDIR@/libs/blkid -BINARY=$BLKIDDIR/bin/blkid -LD_LIBRARY_PATH=$BLKIDDIR/src/ - -export LD_LIBRARY_PATH -exec $BINARY $@ diff --git a/shlibs/blkid/bin/findfs.sh.in b/shlibs/blkid/bin/findfs.sh.in deleted file mode 100644 index 37876c76..00000000 --- a/shlibs/blkid/bin/findfs.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# libtool? Don't ask! - -BLKIDDIR=@SRCDIR@/libs/blkid -BINARY=$BLKIDDIR/bin/findfs -LD_LIBRARY_PATH=$BLKIDDIR/src/ - -export LD_LIBRARY_PATH -exec $BINARY $@ diff --git a/tests/commands.sh.in b/tests/commands.sh.in index 3dc4192e..f9eeec14 100644 --- a/tests/commands.sh.in +++ b/tests/commands.sh.in @@ -45,6 +45,6 @@ TS_CMD_ISLOCAL=${TS_CMD_ISLOCAL-"$TOPDIR/login-utils/islocal_test"} TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$TOPDIR/hwclock/hwclock"} TS_CMD_LSCPU=${TS_CMD_LSCPU-"$TOPDIR/sys-utils/lscpu"} -TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/shlibs/blkid/bin/blkid"} +TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/misc-utils/blkid"} TS_CMD_FDISK=${TS_CMD_FDISK-"$TOPDIR/fdisk/fdisk"} -- 2.39.5