build-sys: use top-level directory for libmount rather than shlibs/mount

Signed-off-by: Karel Zak <kzak@redhat.com>
2011-06-09 21:59:52 +02:00 · 2011-06-09 21:59:52 +02:00 · 2aefc0a8f2
parent 83d20837dc
commit 2aefc0a8f2
39 changed files with 18 additions and 18 deletions
--- 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
--- 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)
--- 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
--- a/shlibs/mount/.gitignore
+++ b/shlibs/mount/.gitignore
--- a/shlibs/mount/COPYING.libmount
+++ b/shlibs/mount/COPYING.libmount
--- a/shlibs/mount/Makefile.am
+++ b/shlibs/mount/Makefile.am
--- a/shlibs/mount/docs/.gitignore
+++ b/shlibs/mount/docs/.gitignore
--- a/shlibs/mount/docs/Makefile.am
+++ b/shlibs/mount/docs/Makefile.am
--- a/shlibs/mount/docs/libmount-docs.xml
+++ b/shlibs/mount/docs/libmount-docs.xml
--- a/shlibs/mount/docs/libmount-sections.txt
+++ b/shlibs/mount/docs/libmount-sections.txt
--- a/shlibs/mount/docs/libmount.types
+++ b/shlibs/mount/docs/libmount.types
--- a/shlibs/mount/docs/version.xml.in
+++ b/shlibs/mount/docs/version.xml.in
--- a/shlibs/mount/mount.pc.in
+++ b/shlibs/mount/mount.pc.in
--- a/shlibs/mount/samples/.gitignore
+++ b/shlibs/mount/samples/.gitignore
--- a/shlibs/mount/samples/Makefile.am
+++ b/shlibs/mount/samples/Makefile.am
--- a/shlibs/mount/samples/mount.c
+++ b/shlibs/mount/samples/mount.c
--- a/shlibs/mount/samples/mountpoint.c
+++ b/shlibs/mount/samples/mountpoint.c
--- a/shlibs/mount/src/Makefile.am
+++ b/shlibs/mount/src/Makefile.am
--- a/shlibs/mount/src/cache.c
+++ b/shlibs/mount/src/cache.c
--- a/shlibs/mount/src/context.c
+++ b/shlibs/mount/src/context.c
--- a/shlibs/mount/src/context_mount.c
+++ b/shlibs/mount/src/context_mount.c
--- a/shlibs/mount/src/context_umount.c
+++ b/shlibs/mount/src/context_umount.c
--- a/shlibs/mount/src/fs.c
+++ b/shlibs/mount/src/fs.c
--- a/shlibs/mount/src/init.c
+++ b/shlibs/mount/src/init.c
--- a/shlibs/mount/src/iter.c
+++ b/shlibs/mount/src/iter.c
--- a/shlibs/mount/src/libmount.h.in
+++ b/shlibs/mount/src/libmount.h.in
--- a/shlibs/mount/src/libmount.sym
+++ b/shlibs/mount/src/libmount.sym
--- a/shlibs/mount/src/lock.c
+++ b/shlibs/mount/src/lock.c
--- a/shlibs/mount/src/mountP.h
+++ b/shlibs/mount/src/mountP.h
--- a/shlibs/mount/src/optmap.c
+++ b/shlibs/mount/src/optmap.c
--- a/shlibs/mount/src/optstr.c
+++ b/shlibs/mount/src/optstr.c
--- a/shlibs/mount/src/tab.c
+++ b/shlibs/mount/src/tab.c
--- a/shlibs/mount/src/tab_diff.c
+++ b/shlibs/mount/src/tab_diff.c
--- a/shlibs/mount/src/tab_parse.c
+++ b/shlibs/mount/src/tab_parse.c
--- a/shlibs/mount/src/tab_update.c
+++ b/shlibs/mount/src/tab_update.c
--- a/shlibs/mount/src/test.c
+++ b/shlibs/mount/src/test.c
--- a/shlibs/mount/src/utils.c
+++ b/shlibs/mount/src/utils.c
--- a/shlibs/mount/src/version.c
+++ b/shlibs/mount/src/version.c
--- 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"