build-sys: use top-level directory for libblkid rather than shlibs/blkid

Signed-off-by: Karel Zak <kzak@redhat.com>
2011-06-09 22:04:24 +02:00 · 2011-06-09 22:04:24 +02:00 · 8fb4efae6f
parent 2aefc0a8f2
commit 8fb4efae6f
116 changed files with 16 additions and 16 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -7,7 +7,7 @@ SHLIBS_DIRS += libuuid
 endif

 if BUILD_LIBBLKID
-SHLIBS_DIRS += shlibs/blkid
+SHLIBS_DIRS += libblkid
 endif

 if BUILD_LIBMOUNT
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@ -12,9 +12,9 @@ dist_noinst_DATA = $(dist_man_MANS)
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
 #
 # blkid
-ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
-ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
-ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
+ul_libblkid_srcdir = $(top_srcdir)/libblkid/src
+ul_libblkid_builddir = $(top_builddir)/libblkid/src
+ul_libblkid_la = $(top_builddir)/libblkid/src/libblkid.la

 # blkid.h is generated by ./configure script and stored in build directory
 ul_libblkid_incdir = $(ul_libblkid_builddir)
--- a/configure.ac
+++ b/configure.ac
@ -1225,16 +1225,16 @@ mount/Makefile
 partx/Makefile
 po/Makefile.in
 schedutils/Makefile
-shlibs/blkid/blkid.pc
-shlibs/blkid/Makefile
-shlibs/blkid/docs/Makefile
-shlibs/blkid/docs/version.xml
-shlibs/blkid/src/Makefile
-shlibs/blkid/src/blkid.h
-shlibs/blkid/src/superblocks/Makefile
-shlibs/blkid/src/topology/Makefile
-shlibs/blkid/src/partitions/Makefile
-shlibs/blkid/samples/Makefile
+libblkid/blkid.pc
+libblkid/Makefile
+libblkid/docs/Makefile
+libblkid/docs/version.xml
+libblkid/src/Makefile
+libblkid/src/blkid.h
+libblkid/src/superblocks/Makefile
+libblkid/src/topology/Makefile
+libblkid/src/partitions/Makefile
+libblkid/samples/Makefile
 libmount/mount.pc
 libmount/Makefile
 libmount/src/Makefile
--- a/shlibs/blkid/.gitignore
+++ b/shlibs/blkid/.gitignore
--- a/shlibs/blkid/COPYING.libblkid
+++ b/shlibs/blkid/COPYING.libblkid
--- a/shlibs/blkid/Makefile.am
+++ b/shlibs/blkid/Makefile.am
--- a/shlibs/blkid/README.blkid
+++ b/shlibs/blkid/README.blkid
--- a/shlibs/blkid/blkid.pc.in
+++ b/shlibs/blkid/blkid.pc.in
--- a/shlibs/blkid/docs/.gitignore
+++ b/shlibs/blkid/docs/.gitignore
--- a/shlibs/blkid/docs/Makefile.am
+++ b/shlibs/blkid/docs/Makefile.am
--- a/shlibs/blkid/docs/libblkid-config.xml
+++ b/shlibs/blkid/docs/libblkid-config.xml
--- a/shlibs/blkid/docs/libblkid-docs.xml
+++ b/shlibs/blkid/docs/libblkid-docs.xml
--- a/shlibs/blkid/docs/libblkid-sections.txt
+++ b/shlibs/blkid/docs/libblkid-sections.txt
--- a/shlibs/blkid/docs/libblkid.types
+++ b/shlibs/blkid/docs/libblkid.types
--- a/shlibs/blkid/docs/version.xml.in
+++ b/shlibs/blkid/docs/version.xml.in
--- a/shlibs/blkid/libblkid.3
+++ b/shlibs/blkid/libblkid.3
--- a/shlibs/blkid/samples/.gitignore
+++ b/shlibs/blkid/samples/.gitignore
--- a/shlibs/blkid/samples/Makefile.am
+++ b/shlibs/blkid/samples/Makefile.am
--- a/shlibs/blkid/samples/mkfs.c
+++ b/shlibs/blkid/samples/mkfs.c
--- a/shlibs/blkid/samples/partitions.c
+++ b/shlibs/blkid/samples/partitions.c
--- a/shlibs/blkid/samples/superblocks.c
+++ b/shlibs/blkid/samples/superblocks.c
--- a/shlibs/blkid/samples/topology.c
+++ b/shlibs/blkid/samples/topology.c
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
--- a/shlibs/blkid/src/blkid.h.in
+++ b/shlibs/blkid/src/blkid.h.in
--- a/shlibs/blkid/src/blkid.sym
+++ b/shlibs/blkid/src/blkid.sym
--- a/shlibs/blkid/src/blkidP.h
+++ b/shlibs/blkid/src/blkidP.h
--- a/shlibs/blkid/src/cache.c
+++ b/shlibs/blkid/src/cache.c
--- a/shlibs/blkid/src/config.c
+++ b/shlibs/blkid/src/config.c
--- a/shlibs/blkid/src/dev.c
+++ b/shlibs/blkid/src/dev.c
--- a/shlibs/blkid/src/devname.c
+++ b/shlibs/blkid/src/devname.c
--- a/shlibs/blkid/src/devno.c
+++ b/shlibs/blkid/src/devno.c
--- a/shlibs/blkid/src/encode.c
+++ b/shlibs/blkid/src/encode.c
--- a/shlibs/blkid/src/evaluate.c
+++ b/shlibs/blkid/src/evaluate.c
--- a/shlibs/blkid/src/getsize.c
+++ b/shlibs/blkid/src/getsize.c
--- a/shlibs/blkid/src/llseek.c
+++ b/shlibs/blkid/src/llseek.c
--- a/shlibs/blkid/src/partitions/Makefile.am
+++ b/shlibs/blkid/src/partitions/Makefile.am
--- a/shlibs/blkid/src/partitions/aix.c
+++ b/shlibs/blkid/src/partitions/aix.c
--- a/shlibs/blkid/src/partitions/aix.h
+++ b/shlibs/blkid/src/partitions/aix.h
--- a/shlibs/blkid/src/partitions/blkid_parttypes.h
+++ b/shlibs/blkid/src/partitions/blkid_parttypes.h
--- a/shlibs/blkid/src/partitions/bsd.c
+++ b/shlibs/blkid/src/partitions/bsd.c
--- a/shlibs/blkid/src/partitions/dos.c
+++ b/shlibs/blkid/src/partitions/dos.c
--- a/shlibs/blkid/src/partitions/dos.h
+++ b/shlibs/blkid/src/partitions/dos.h
--- a/shlibs/blkid/src/partitions/gpt.c
+++ b/shlibs/blkid/src/partitions/gpt.c
--- a/shlibs/blkid/src/partitions/mac.c
+++ b/shlibs/blkid/src/partitions/mac.c
--- a/shlibs/blkid/src/partitions/minix.c
+++ b/shlibs/blkid/src/partitions/minix.c
--- a/shlibs/blkid/src/partitions/partitions.c
+++ b/shlibs/blkid/src/partitions/partitions.c
--- a/shlibs/blkid/src/partitions/partitions.h
+++ b/shlibs/blkid/src/partitions/partitions.h
--- a/shlibs/blkid/src/partitions/sgi.c
+++ b/shlibs/blkid/src/partitions/sgi.c
--- a/shlibs/blkid/src/partitions/solaris_x86.c
+++ b/shlibs/blkid/src/partitions/solaris_x86.c
--- a/shlibs/blkid/src/partitions/sun.c
+++ b/shlibs/blkid/src/partitions/sun.c
--- a/shlibs/blkid/src/partitions/ultrix.c
+++ b/shlibs/blkid/src/partitions/ultrix.c
--- a/shlibs/blkid/src/partitions/unixware.c
+++ b/shlibs/blkid/src/partitions/unixware.c
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
--- a/shlibs/blkid/src/read.c
+++ b/shlibs/blkid/src/read.c
--- a/shlibs/blkid/src/resolve.c
+++ b/shlibs/blkid/src/resolve.c
--- a/shlibs/blkid/src/save.c
+++ b/shlibs/blkid/src/save.c
--- a/shlibs/blkid/src/superblocks/Makefile.am
+++ b/shlibs/blkid/src/superblocks/Makefile.am
--- a/shlibs/blkid/src/superblocks/adaptec_raid.c
+++ b/shlibs/blkid/src/superblocks/adaptec_raid.c
--- a/shlibs/blkid/src/superblocks/befs.c
+++ b/shlibs/blkid/src/superblocks/befs.c
--- a/shlibs/blkid/src/superblocks/bfs.c
+++ b/shlibs/blkid/src/superblocks/bfs.c
--- a/shlibs/blkid/src/superblocks/btrfs.c
+++ b/shlibs/blkid/src/superblocks/btrfs.c
--- a/shlibs/blkid/src/superblocks/cramfs.c
+++ b/shlibs/blkid/src/superblocks/cramfs.c
--- a/shlibs/blkid/src/superblocks/ddf_raid.c
+++ b/shlibs/blkid/src/superblocks/ddf_raid.c
--- a/shlibs/blkid/src/superblocks/drbd.c
+++ b/shlibs/blkid/src/superblocks/drbd.c
--- a/shlibs/blkid/src/superblocks/exfat.c
+++ b/shlibs/blkid/src/superblocks/exfat.c
--- a/shlibs/blkid/src/superblocks/ext.c
+++ b/shlibs/blkid/src/superblocks/ext.c
--- a/shlibs/blkid/src/superblocks/gfs.c
+++ b/shlibs/blkid/src/superblocks/gfs.c
--- a/shlibs/blkid/src/superblocks/hfs.c
+++ b/shlibs/blkid/src/superblocks/hfs.c
--- a/shlibs/blkid/src/superblocks/highpoint_raid.c
+++ b/shlibs/blkid/src/superblocks/highpoint_raid.c
--- a/shlibs/blkid/src/superblocks/hpfs.c
+++ b/shlibs/blkid/src/superblocks/hpfs.c
--- a/shlibs/blkid/src/superblocks/iso9660.c
+++ b/shlibs/blkid/src/superblocks/iso9660.c
--- a/shlibs/blkid/src/superblocks/isw_raid.c
+++ b/shlibs/blkid/src/superblocks/isw_raid.c
--- a/shlibs/blkid/src/superblocks/jfs.c
+++ b/shlibs/blkid/src/superblocks/jfs.c
--- a/shlibs/blkid/src/superblocks/jmicron_raid.c
+++ b/shlibs/blkid/src/superblocks/jmicron_raid.c
--- a/shlibs/blkid/src/superblocks/linux_raid.c
+++ b/shlibs/blkid/src/superblocks/linux_raid.c
--- a/shlibs/blkid/src/superblocks/lsi_raid.c
+++ b/shlibs/blkid/src/superblocks/lsi_raid.c
--- a/shlibs/blkid/src/superblocks/luks.c
+++ b/shlibs/blkid/src/superblocks/luks.c
--- a/shlibs/blkid/src/superblocks/lvm.c
+++ b/shlibs/blkid/src/superblocks/lvm.c
--- a/shlibs/blkid/src/superblocks/minix.c
+++ b/shlibs/blkid/src/superblocks/minix.c
--- a/shlibs/blkid/src/superblocks/netware.c
+++ b/shlibs/blkid/src/superblocks/netware.c
--- a/shlibs/blkid/src/superblocks/nilfs.c
+++ b/shlibs/blkid/src/superblocks/nilfs.c
--- a/shlibs/blkid/src/superblocks/ntfs.c
+++ b/shlibs/blkid/src/superblocks/ntfs.c
--- a/shlibs/blkid/src/superblocks/nvidia_raid.c
+++ b/shlibs/blkid/src/superblocks/nvidia_raid.c
--- a/shlibs/blkid/src/superblocks/ocfs.c
+++ b/shlibs/blkid/src/superblocks/ocfs.c
--- a/shlibs/blkid/src/superblocks/promise_raid.c
+++ b/shlibs/blkid/src/superblocks/promise_raid.c
--- a/shlibs/blkid/src/superblocks/reiserfs.c
+++ b/shlibs/blkid/src/superblocks/reiserfs.c
--- a/shlibs/blkid/src/superblocks/romfs.c
+++ b/shlibs/blkid/src/superblocks/romfs.c
--- a/shlibs/blkid/src/superblocks/silicon_raid.c
+++ b/shlibs/blkid/src/superblocks/silicon_raid.c
--- a/shlibs/blkid/src/superblocks/squashfs.c
+++ b/shlibs/blkid/src/superblocks/squashfs.c
--- a/shlibs/blkid/src/superblocks/superblocks.c
+++ b/shlibs/blkid/src/superblocks/superblocks.c
--- a/shlibs/blkid/src/superblocks/superblocks.h
+++ b/shlibs/blkid/src/superblocks/superblocks.h
--- a/shlibs/blkid/src/superblocks/swap.c
+++ b/shlibs/blkid/src/superblocks/swap.c
--- a/shlibs/blkid/src/superblocks/sysv.c
+++ b/shlibs/blkid/src/superblocks/sysv.c
--- a/shlibs/blkid/src/superblocks/ubifs.c
+++ b/shlibs/blkid/src/superblocks/ubifs.c
--- a/shlibs/blkid/src/superblocks/udf.c
+++ b/shlibs/blkid/src/superblocks/udf.c
--- a/shlibs/blkid/src/superblocks/ufs.c
+++ b/shlibs/blkid/src/superblocks/ufs.c
--- a/shlibs/blkid/src/superblocks/vfat.c
+++ b/shlibs/blkid/src/superblocks/vfat.c
--- a/shlibs/blkid/src/superblocks/via_raid.c
+++ b/shlibs/blkid/src/superblocks/via_raid.c
--- a/shlibs/blkid/src/superblocks/vmfs.c
+++ b/shlibs/blkid/src/superblocks/vmfs.c
--- a/shlibs/blkid/src/superblocks/vxfs.c
+++ b/shlibs/blkid/src/superblocks/vxfs.c
--- a/Show More
+++ b/Show More