build-sys: use top-level directory for libmount rather than shlibs/mount
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
83d20837dc
commit
2aefc0a8f2
|
@ -11,7 +11,7 @@ SHLIBS_DIRS += shlibs/blkid
|
|||
endif
|
||||
|
||||
if BUILD_LIBMOUNT
|
||||
SHLIBS_DIRS += shlibs/mount
|
||||
SHLIBS_DIRS += libmount
|
||||
endif
|
||||
|
||||
MAN_DIRS = man/ru
|
||||
|
|
|
@ -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)
|
||||
|
|
14
configure.ac
14
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
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue