From: Karel Zak Date: Thu, 9 Jun 2011 19:59:52 +0000 (+0200) Subject: build-sys: use top-level directory for libmount rather than shlibs/mount X-Git-Tag: v2.20-rc1~181 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2aefc0a8f267ddb57804755af9095d3cd5ceb0d7;p=thirdparty%2Futil-linux.git build-sys: use top-level directory for libmount rather than shlibs/mount Signed-off-by: Karel Zak --- diff --git a/Makefile.am b/Makefile.am index 77c774db26..b116483cf2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ SHLIBS_DIRS += shlibs/blkid endif if BUILD_LIBMOUNT -SHLIBS_DIRS += shlibs/mount +SHLIBS_DIRS += libmount endif MAN_DIRS = man/ru diff --git a/config/include-Makefile.am b/config/include-Makefile.am index 2c8d9c587e..49e45ccc28 100644 --- a/config/include-Makefile.am +++ b/config/include-Makefile.am @@ -33,9 +33,9 @@ $(ul_libuuid_la): # mount -ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src -ul_libmount_builddir = $(top_builddir)/shlibs/mount/src -ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la +ul_libmount_srcdir = $(top_srcdir)/libmount/src +ul_libmount_builddir = $(top_builddir)/libmount/src +ul_libmount_la = $(top_builddir)/libmount/src/libmount.la # libmount.h is generated by ./configure script and stored in build directory ul_libmount_incdir = $(ul_libmount_builddir) diff --git a/configure.ac b/configure.ac index d380583320..984b41bb02 100644 --- a/configure.ac +++ b/configure.ac @@ -1235,13 +1235,13 @@ shlibs/blkid/src/superblocks/Makefile shlibs/blkid/src/topology/Makefile shlibs/blkid/src/partitions/Makefile shlibs/blkid/samples/Makefile -shlibs/mount/mount.pc -shlibs/mount/Makefile -shlibs/mount/src/Makefile -shlibs/mount/src/libmount.h -shlibs/mount/docs/Makefile -shlibs/mount/docs/version.xml -shlibs/mount/samples/Makefile +libmount/mount.pc +libmount/Makefile +libmount/src/Makefile +libmount/src/libmount.h +libmount/docs/Makefile +libmount/docs/version.xml +libmount/samples/Makefile libuuid/uuid.pc libuuid/Makefile libuuid/man/Makefile diff --git a/shlibs/mount/.gitignore b/libmount/.gitignore similarity index 100% rename from shlibs/mount/.gitignore rename to libmount/.gitignore diff --git a/shlibs/mount/COPYING.libmount b/libmount/COPYING.libmount similarity index 100% rename from shlibs/mount/COPYING.libmount rename to libmount/COPYING.libmount diff --git a/shlibs/mount/Makefile.am b/libmount/Makefile.am similarity index 100% rename from shlibs/mount/Makefile.am rename to libmount/Makefile.am diff --git a/shlibs/mount/docs/.gitignore b/libmount/docs/.gitignore similarity index 100% rename from shlibs/mount/docs/.gitignore rename to libmount/docs/.gitignore diff --git a/shlibs/mount/docs/Makefile.am b/libmount/docs/Makefile.am similarity index 100% rename from shlibs/mount/docs/Makefile.am rename to libmount/docs/Makefile.am diff --git a/shlibs/mount/docs/libmount-docs.xml b/libmount/docs/libmount-docs.xml similarity index 100% rename from shlibs/mount/docs/libmount-docs.xml rename to libmount/docs/libmount-docs.xml diff --git a/shlibs/mount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt similarity index 100% rename from shlibs/mount/docs/libmount-sections.txt rename to libmount/docs/libmount-sections.txt diff --git a/shlibs/mount/docs/libmount.types b/libmount/docs/libmount.types similarity index 100% rename from shlibs/mount/docs/libmount.types rename to libmount/docs/libmount.types diff --git a/shlibs/mount/docs/version.xml.in b/libmount/docs/version.xml.in similarity index 100% rename from shlibs/mount/docs/version.xml.in rename to libmount/docs/version.xml.in diff --git a/shlibs/mount/mount.pc.in b/libmount/mount.pc.in similarity index 100% rename from shlibs/mount/mount.pc.in rename to libmount/mount.pc.in diff --git a/shlibs/mount/samples/.gitignore b/libmount/samples/.gitignore similarity index 100% rename from shlibs/mount/samples/.gitignore rename to libmount/samples/.gitignore diff --git a/shlibs/mount/samples/Makefile.am b/libmount/samples/Makefile.am similarity index 100% rename from shlibs/mount/samples/Makefile.am rename to libmount/samples/Makefile.am diff --git a/shlibs/mount/samples/mount.c b/libmount/samples/mount.c similarity index 100% rename from shlibs/mount/samples/mount.c rename to libmount/samples/mount.c diff --git a/shlibs/mount/samples/mountpoint.c b/libmount/samples/mountpoint.c similarity index 100% rename from shlibs/mount/samples/mountpoint.c rename to libmount/samples/mountpoint.c diff --git a/shlibs/mount/src/Makefile.am b/libmount/src/Makefile.am similarity index 100% rename from shlibs/mount/src/Makefile.am rename to libmount/src/Makefile.am diff --git a/shlibs/mount/src/cache.c b/libmount/src/cache.c similarity index 100% rename from shlibs/mount/src/cache.c rename to libmount/src/cache.c diff --git a/shlibs/mount/src/context.c b/libmount/src/context.c similarity index 100% rename from shlibs/mount/src/context.c rename to libmount/src/context.c diff --git a/shlibs/mount/src/context_mount.c b/libmount/src/context_mount.c similarity index 100% rename from shlibs/mount/src/context_mount.c rename to libmount/src/context_mount.c diff --git a/shlibs/mount/src/context_umount.c b/libmount/src/context_umount.c similarity index 100% rename from shlibs/mount/src/context_umount.c rename to libmount/src/context_umount.c diff --git a/shlibs/mount/src/fs.c b/libmount/src/fs.c similarity index 100% rename from shlibs/mount/src/fs.c rename to libmount/src/fs.c diff --git a/shlibs/mount/src/init.c b/libmount/src/init.c similarity index 100% rename from shlibs/mount/src/init.c rename to libmount/src/init.c diff --git a/shlibs/mount/src/iter.c b/libmount/src/iter.c similarity index 100% rename from shlibs/mount/src/iter.c rename to libmount/src/iter.c diff --git a/shlibs/mount/src/libmount.h.in b/libmount/src/libmount.h.in similarity index 100% rename from shlibs/mount/src/libmount.h.in rename to libmount/src/libmount.h.in diff --git a/shlibs/mount/src/libmount.sym b/libmount/src/libmount.sym similarity index 100% rename from shlibs/mount/src/libmount.sym rename to libmount/src/libmount.sym diff --git a/shlibs/mount/src/lock.c b/libmount/src/lock.c similarity index 100% rename from shlibs/mount/src/lock.c rename to libmount/src/lock.c diff --git a/shlibs/mount/src/mountP.h b/libmount/src/mountP.h similarity index 100% rename from shlibs/mount/src/mountP.h rename to libmount/src/mountP.h diff --git a/shlibs/mount/src/optmap.c b/libmount/src/optmap.c similarity index 100% rename from shlibs/mount/src/optmap.c rename to libmount/src/optmap.c diff --git a/shlibs/mount/src/optstr.c b/libmount/src/optstr.c similarity index 100% rename from shlibs/mount/src/optstr.c rename to libmount/src/optstr.c diff --git a/shlibs/mount/src/tab.c b/libmount/src/tab.c similarity index 100% rename from shlibs/mount/src/tab.c rename to libmount/src/tab.c diff --git a/shlibs/mount/src/tab_diff.c b/libmount/src/tab_diff.c similarity index 100% rename from shlibs/mount/src/tab_diff.c rename to libmount/src/tab_diff.c diff --git a/shlibs/mount/src/tab_parse.c b/libmount/src/tab_parse.c similarity index 100% rename from shlibs/mount/src/tab_parse.c rename to libmount/src/tab_parse.c diff --git a/shlibs/mount/src/tab_update.c b/libmount/src/tab_update.c similarity index 100% rename from shlibs/mount/src/tab_update.c rename to libmount/src/tab_update.c diff --git a/shlibs/mount/src/test.c b/libmount/src/test.c similarity index 100% rename from shlibs/mount/src/test.c rename to libmount/src/test.c diff --git a/shlibs/mount/src/utils.c b/libmount/src/utils.c similarity index 100% rename from shlibs/mount/src/utils.c rename to libmount/src/utils.c diff --git a/shlibs/mount/src/version.c b/libmount/src/version.c similarity index 100% rename from shlibs/mount/src/version.c rename to libmount/src/version.c diff --git a/tests/commands.sh.in b/tests/commands.sh.in index 1b04825ff3..e976b9971e 100644 --- a/tests/commands.sh.in +++ b/tests/commands.sh.in @@ -16,13 +16,13 @@ TS_HELPER_STRUTILS="$top_builddir/lib/test_strutils" TS_HELPER_CPUSET="$top_builddir/lib/test_cpuset" # libmount -TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/shlibs/mount/src/test_optstr" -TS_HELPER_LIBMOUNT_TAB="$top_builddir/shlibs/mount/src/test_tab" -TS_HELPER_LIBMOUNT_UTILS="$top_builddir/shlibs/mount/src/test_utils" -TS_HELPER_LIBMOUNT_LOCK="$top_builddir/shlibs/mount/src/test_lock" -TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/shlibs/mount/src/test_tab_update" -TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/shlibs/mount/src/test_context" -TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/shlibs/mount/src/test_tab_diff" +TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/libmount/src/test_optstr" +TS_HELPER_LIBMOUNT_TAB="$top_builddir/libmount/src/test_tab" +TS_HELPER_LIBMOUNT_UTILS="$top_builddir/libmount/src/test_utils" +TS_HELPER_LIBMOUNT_LOCK="$top_builddir/libmount/src/test_lock" +TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/libmount/src/test_tab_update" +TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/libmount/src/test_context" +TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/libmount/src/test_tab_diff" # TODO: use partx TS_HELPER_PARTITIONS="$top_builddir/shlibs/blkid/samples/partitions"