build-sys: use top-level directory for libblkid rather than shlibs/blkid
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
2aefc0a8f2
commit
8fb4efae6f
|
@ -7,7 +7,7 @@ SHLIBS_DIRS += libuuid
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_LIBBLKID
|
if BUILD_LIBBLKID
|
||||||
SHLIBS_DIRS += shlibs/blkid
|
SHLIBS_DIRS += libblkid
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_LIBMOUNT
|
if BUILD_LIBMOUNT
|
||||||
|
|
|
@ -12,9 +12,9 @@ dist_noinst_DATA = $(dist_man_MANS)
|
||||||
# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
|
# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
|
||||||
#
|
#
|
||||||
# blkid
|
# blkid
|
||||||
ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
|
ul_libblkid_srcdir = $(top_srcdir)/libblkid/src
|
||||||
ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
|
ul_libblkid_builddir = $(top_builddir)/libblkid/src
|
||||||
ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
|
ul_libblkid_la = $(top_builddir)/libblkid/src/libblkid.la
|
||||||
|
|
||||||
# blkid.h is generated by ./configure script and stored in build directory
|
# blkid.h is generated by ./configure script and stored in build directory
|
||||||
ul_libblkid_incdir = $(ul_libblkid_builddir)
|
ul_libblkid_incdir = $(ul_libblkid_builddir)
|
||||||
|
|
20
configure.ac
20
configure.ac
|
@ -1225,16 +1225,16 @@ mount/Makefile
|
||||||
partx/Makefile
|
partx/Makefile
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
schedutils/Makefile
|
schedutils/Makefile
|
||||||
shlibs/blkid/blkid.pc
|
libblkid/blkid.pc
|
||||||
shlibs/blkid/Makefile
|
libblkid/Makefile
|
||||||
shlibs/blkid/docs/Makefile
|
libblkid/docs/Makefile
|
||||||
shlibs/blkid/docs/version.xml
|
libblkid/docs/version.xml
|
||||||
shlibs/blkid/src/Makefile
|
libblkid/src/Makefile
|
||||||
shlibs/blkid/src/blkid.h
|
libblkid/src/blkid.h
|
||||||
shlibs/blkid/src/superblocks/Makefile
|
libblkid/src/superblocks/Makefile
|
||||||
shlibs/blkid/src/topology/Makefile
|
libblkid/src/topology/Makefile
|
||||||
shlibs/blkid/src/partitions/Makefile
|
libblkid/src/partitions/Makefile
|
||||||
shlibs/blkid/samples/Makefile
|
libblkid/samples/Makefile
|
||||||
libmount/mount.pc
|
libmount/mount.pc
|
||||||
libmount/Makefile
|
libmount/Makefile
|
||||||
libmount/src/Makefile
|
libmount/src/Makefile
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue