From: Karel Zak <kzak@redhat.com>
Date: Thu, 9 Jun 2011 20:04:24 +0000 (+0200)
Subject: build-sys: use top-level directory for libblkid rather than shlibs/blkid
X-Git-Tag: v2.20-rc1~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fb4efae6f5fabbe889bebbda60e9f7dce930f1f;p=thirdparty%2Futil-linux.git

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

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index b116483cf2..01a28bb7e2 100644
--- 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
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 49e45ccc28..8c41ad1942 100644
--- 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)
diff --git a/configure.ac b/configure.ac
index 984b41bb02..3524623e67 100644
--- 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
diff --git a/shlibs/blkid/.gitignore b/libblkid/.gitignore
similarity index 100%
rename from shlibs/blkid/.gitignore
rename to libblkid/.gitignore
diff --git a/shlibs/blkid/COPYING.libblkid b/libblkid/COPYING.libblkid
similarity index 100%
rename from shlibs/blkid/COPYING.libblkid
rename to libblkid/COPYING.libblkid
diff --git a/shlibs/blkid/Makefile.am b/libblkid/Makefile.am
similarity index 100%
rename from shlibs/blkid/Makefile.am
rename to libblkid/Makefile.am
diff --git a/shlibs/blkid/README.blkid b/libblkid/README.blkid
similarity index 100%
rename from shlibs/blkid/README.blkid
rename to libblkid/README.blkid
diff --git a/shlibs/blkid/blkid.pc.in b/libblkid/blkid.pc.in
similarity index 100%
rename from shlibs/blkid/blkid.pc.in
rename to libblkid/blkid.pc.in
diff --git a/shlibs/blkid/docs/.gitignore b/libblkid/docs/.gitignore
similarity index 100%
rename from shlibs/blkid/docs/.gitignore
rename to libblkid/docs/.gitignore
diff --git a/shlibs/blkid/docs/Makefile.am b/libblkid/docs/Makefile.am
similarity index 100%
rename from shlibs/blkid/docs/Makefile.am
rename to libblkid/docs/Makefile.am
diff --git a/shlibs/blkid/docs/libblkid-config.xml b/libblkid/docs/libblkid-config.xml
similarity index 100%
rename from shlibs/blkid/docs/libblkid-config.xml
rename to libblkid/docs/libblkid-config.xml
diff --git a/shlibs/blkid/docs/libblkid-docs.xml b/libblkid/docs/libblkid-docs.xml
similarity index 100%
rename from shlibs/blkid/docs/libblkid-docs.xml
rename to libblkid/docs/libblkid-docs.xml
diff --git a/shlibs/blkid/docs/libblkid-sections.txt b/libblkid/docs/libblkid-sections.txt
similarity index 100%
rename from shlibs/blkid/docs/libblkid-sections.txt
rename to libblkid/docs/libblkid-sections.txt
diff --git a/shlibs/blkid/docs/libblkid.types b/libblkid/docs/libblkid.types
similarity index 100%
rename from shlibs/blkid/docs/libblkid.types
rename to libblkid/docs/libblkid.types
diff --git a/shlibs/blkid/docs/version.xml.in b/libblkid/docs/version.xml.in
similarity index 100%
rename from shlibs/blkid/docs/version.xml.in
rename to libblkid/docs/version.xml.in
diff --git a/shlibs/blkid/libblkid.3 b/libblkid/libblkid.3
similarity index 100%
rename from shlibs/blkid/libblkid.3
rename to libblkid/libblkid.3
diff --git a/shlibs/blkid/samples/.gitignore b/libblkid/samples/.gitignore
similarity index 100%
rename from shlibs/blkid/samples/.gitignore
rename to libblkid/samples/.gitignore
diff --git a/shlibs/blkid/samples/Makefile.am b/libblkid/samples/Makefile.am
similarity index 100%
rename from shlibs/blkid/samples/Makefile.am
rename to libblkid/samples/Makefile.am
diff --git a/shlibs/blkid/samples/mkfs.c b/libblkid/samples/mkfs.c
similarity index 100%
rename from shlibs/blkid/samples/mkfs.c
rename to libblkid/samples/mkfs.c
diff --git a/shlibs/blkid/samples/partitions.c b/libblkid/samples/partitions.c
similarity index 100%
rename from shlibs/blkid/samples/partitions.c
rename to libblkid/samples/partitions.c
diff --git a/shlibs/blkid/samples/superblocks.c b/libblkid/samples/superblocks.c
similarity index 100%
rename from shlibs/blkid/samples/superblocks.c
rename to libblkid/samples/superblocks.c
diff --git a/shlibs/blkid/samples/topology.c b/libblkid/samples/topology.c
similarity index 100%
rename from shlibs/blkid/samples/topology.c
rename to libblkid/samples/topology.c
diff --git a/shlibs/blkid/src/Makefile.am b/libblkid/src/Makefile.am
similarity index 100%
rename from shlibs/blkid/src/Makefile.am
rename to libblkid/src/Makefile.am
diff --git a/shlibs/blkid/src/blkid.h.in b/libblkid/src/blkid.h.in
similarity index 100%
rename from shlibs/blkid/src/blkid.h.in
rename to libblkid/src/blkid.h.in
diff --git a/shlibs/blkid/src/blkid.sym b/libblkid/src/blkid.sym
similarity index 100%
rename from shlibs/blkid/src/blkid.sym
rename to libblkid/src/blkid.sym
diff --git a/shlibs/blkid/src/blkidP.h b/libblkid/src/blkidP.h
similarity index 100%
rename from shlibs/blkid/src/blkidP.h
rename to libblkid/src/blkidP.h
diff --git a/shlibs/blkid/src/cache.c b/libblkid/src/cache.c
similarity index 100%
rename from shlibs/blkid/src/cache.c
rename to libblkid/src/cache.c
diff --git a/shlibs/blkid/src/config.c b/libblkid/src/config.c
similarity index 100%
rename from shlibs/blkid/src/config.c
rename to libblkid/src/config.c
diff --git a/shlibs/blkid/src/dev.c b/libblkid/src/dev.c
similarity index 100%
rename from shlibs/blkid/src/dev.c
rename to libblkid/src/dev.c
diff --git a/shlibs/blkid/src/devname.c b/libblkid/src/devname.c
similarity index 100%
rename from shlibs/blkid/src/devname.c
rename to libblkid/src/devname.c
diff --git a/shlibs/blkid/src/devno.c b/libblkid/src/devno.c
similarity index 100%
rename from shlibs/blkid/src/devno.c
rename to libblkid/src/devno.c
diff --git a/shlibs/blkid/src/encode.c b/libblkid/src/encode.c
similarity index 100%
rename from shlibs/blkid/src/encode.c
rename to libblkid/src/encode.c
diff --git a/shlibs/blkid/src/evaluate.c b/libblkid/src/evaluate.c
similarity index 100%
rename from shlibs/blkid/src/evaluate.c
rename to libblkid/src/evaluate.c
diff --git a/shlibs/blkid/src/getsize.c b/libblkid/src/getsize.c
similarity index 100%
rename from shlibs/blkid/src/getsize.c
rename to libblkid/src/getsize.c
diff --git a/shlibs/blkid/src/llseek.c b/libblkid/src/llseek.c
similarity index 100%
rename from shlibs/blkid/src/llseek.c
rename to libblkid/src/llseek.c
diff --git a/shlibs/blkid/src/partitions/Makefile.am b/libblkid/src/partitions/Makefile.am
similarity index 100%
rename from shlibs/blkid/src/partitions/Makefile.am
rename to libblkid/src/partitions/Makefile.am
diff --git a/shlibs/blkid/src/partitions/aix.c b/libblkid/src/partitions/aix.c
similarity index 100%
rename from shlibs/blkid/src/partitions/aix.c
rename to libblkid/src/partitions/aix.c
diff --git a/shlibs/blkid/src/partitions/aix.h b/libblkid/src/partitions/aix.h
similarity index 100%
rename from shlibs/blkid/src/partitions/aix.h
rename to libblkid/src/partitions/aix.h
diff --git a/shlibs/blkid/src/partitions/blkid_parttypes.h b/libblkid/src/partitions/blkid_parttypes.h
similarity index 100%
rename from shlibs/blkid/src/partitions/blkid_parttypes.h
rename to libblkid/src/partitions/blkid_parttypes.h
diff --git a/shlibs/blkid/src/partitions/bsd.c b/libblkid/src/partitions/bsd.c
similarity index 100%
rename from shlibs/blkid/src/partitions/bsd.c
rename to libblkid/src/partitions/bsd.c
diff --git a/shlibs/blkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c
similarity index 100%
rename from shlibs/blkid/src/partitions/dos.c
rename to libblkid/src/partitions/dos.c
diff --git a/shlibs/blkid/src/partitions/dos.h b/libblkid/src/partitions/dos.h
similarity index 100%
rename from shlibs/blkid/src/partitions/dos.h
rename to libblkid/src/partitions/dos.h
diff --git a/shlibs/blkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c
similarity index 100%
rename from shlibs/blkid/src/partitions/gpt.c
rename to libblkid/src/partitions/gpt.c
diff --git a/shlibs/blkid/src/partitions/mac.c b/libblkid/src/partitions/mac.c
similarity index 100%
rename from shlibs/blkid/src/partitions/mac.c
rename to libblkid/src/partitions/mac.c
diff --git a/shlibs/blkid/src/partitions/minix.c b/libblkid/src/partitions/minix.c
similarity index 100%
rename from shlibs/blkid/src/partitions/minix.c
rename to libblkid/src/partitions/minix.c
diff --git a/shlibs/blkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
similarity index 100%
rename from shlibs/blkid/src/partitions/partitions.c
rename to libblkid/src/partitions/partitions.c
diff --git a/shlibs/blkid/src/partitions/partitions.h b/libblkid/src/partitions/partitions.h
similarity index 100%
rename from shlibs/blkid/src/partitions/partitions.h
rename to libblkid/src/partitions/partitions.h
diff --git a/shlibs/blkid/src/partitions/sgi.c b/libblkid/src/partitions/sgi.c
similarity index 100%
rename from shlibs/blkid/src/partitions/sgi.c
rename to libblkid/src/partitions/sgi.c
diff --git a/shlibs/blkid/src/partitions/solaris_x86.c b/libblkid/src/partitions/solaris_x86.c
similarity index 100%
rename from shlibs/blkid/src/partitions/solaris_x86.c
rename to libblkid/src/partitions/solaris_x86.c
diff --git a/shlibs/blkid/src/partitions/sun.c b/libblkid/src/partitions/sun.c
similarity index 100%
rename from shlibs/blkid/src/partitions/sun.c
rename to libblkid/src/partitions/sun.c
diff --git a/shlibs/blkid/src/partitions/ultrix.c b/libblkid/src/partitions/ultrix.c
similarity index 100%
rename from shlibs/blkid/src/partitions/ultrix.c
rename to libblkid/src/partitions/ultrix.c
diff --git a/shlibs/blkid/src/partitions/unixware.c b/libblkid/src/partitions/unixware.c
similarity index 100%
rename from shlibs/blkid/src/partitions/unixware.c
rename to libblkid/src/partitions/unixware.c
diff --git a/shlibs/blkid/src/probe.c b/libblkid/src/probe.c
similarity index 100%
rename from shlibs/blkid/src/probe.c
rename to libblkid/src/probe.c
diff --git a/shlibs/blkid/src/read.c b/libblkid/src/read.c
similarity index 100%
rename from shlibs/blkid/src/read.c
rename to libblkid/src/read.c
diff --git a/shlibs/blkid/src/resolve.c b/libblkid/src/resolve.c
similarity index 100%
rename from shlibs/blkid/src/resolve.c
rename to libblkid/src/resolve.c
diff --git a/shlibs/blkid/src/save.c b/libblkid/src/save.c
similarity index 100%
rename from shlibs/blkid/src/save.c
rename to libblkid/src/save.c
diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/libblkid/src/superblocks/Makefile.am
similarity index 100%
rename from shlibs/blkid/src/superblocks/Makefile.am
rename to libblkid/src/superblocks/Makefile.am
diff --git a/shlibs/blkid/src/superblocks/adaptec_raid.c b/libblkid/src/superblocks/adaptec_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/adaptec_raid.c
rename to libblkid/src/superblocks/adaptec_raid.c
diff --git a/shlibs/blkid/src/superblocks/befs.c b/libblkid/src/superblocks/befs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/befs.c
rename to libblkid/src/superblocks/befs.c
diff --git a/shlibs/blkid/src/superblocks/bfs.c b/libblkid/src/superblocks/bfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/bfs.c
rename to libblkid/src/superblocks/bfs.c
diff --git a/shlibs/blkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/btrfs.c
rename to libblkid/src/superblocks/btrfs.c
diff --git a/shlibs/blkid/src/superblocks/cramfs.c b/libblkid/src/superblocks/cramfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/cramfs.c
rename to libblkid/src/superblocks/cramfs.c
diff --git a/shlibs/blkid/src/superblocks/ddf_raid.c b/libblkid/src/superblocks/ddf_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/ddf_raid.c
rename to libblkid/src/superblocks/ddf_raid.c
diff --git a/shlibs/blkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/drbd.c
rename to libblkid/src/superblocks/drbd.c
diff --git a/shlibs/blkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/exfat.c
rename to libblkid/src/superblocks/exfat.c
diff --git a/shlibs/blkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/ext.c
rename to libblkid/src/superblocks/ext.c
diff --git a/shlibs/blkid/src/superblocks/gfs.c b/libblkid/src/superblocks/gfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/gfs.c
rename to libblkid/src/superblocks/gfs.c
diff --git a/shlibs/blkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/hfs.c
rename to libblkid/src/superblocks/hfs.c
diff --git a/shlibs/blkid/src/superblocks/highpoint_raid.c b/libblkid/src/superblocks/highpoint_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/highpoint_raid.c
rename to libblkid/src/superblocks/highpoint_raid.c
diff --git a/shlibs/blkid/src/superblocks/hpfs.c b/libblkid/src/superblocks/hpfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/hpfs.c
rename to libblkid/src/superblocks/hpfs.c
diff --git a/shlibs/blkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/iso9660.c
rename to libblkid/src/superblocks/iso9660.c
diff --git a/shlibs/blkid/src/superblocks/isw_raid.c b/libblkid/src/superblocks/isw_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/isw_raid.c
rename to libblkid/src/superblocks/isw_raid.c
diff --git a/shlibs/blkid/src/superblocks/jfs.c b/libblkid/src/superblocks/jfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/jfs.c
rename to libblkid/src/superblocks/jfs.c
diff --git a/shlibs/blkid/src/superblocks/jmicron_raid.c b/libblkid/src/superblocks/jmicron_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/jmicron_raid.c
rename to libblkid/src/superblocks/jmicron_raid.c
diff --git a/shlibs/blkid/src/superblocks/linux_raid.c b/libblkid/src/superblocks/linux_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/linux_raid.c
rename to libblkid/src/superblocks/linux_raid.c
diff --git a/shlibs/blkid/src/superblocks/lsi_raid.c b/libblkid/src/superblocks/lsi_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/lsi_raid.c
rename to libblkid/src/superblocks/lsi_raid.c
diff --git a/shlibs/blkid/src/superblocks/luks.c b/libblkid/src/superblocks/luks.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/luks.c
rename to libblkid/src/superblocks/luks.c
diff --git a/shlibs/blkid/src/superblocks/lvm.c b/libblkid/src/superblocks/lvm.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/lvm.c
rename to libblkid/src/superblocks/lvm.c
diff --git a/shlibs/blkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/minix.c
rename to libblkid/src/superblocks/minix.c
diff --git a/shlibs/blkid/src/superblocks/netware.c b/libblkid/src/superblocks/netware.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/netware.c
rename to libblkid/src/superblocks/netware.c
diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/nilfs.c
rename to libblkid/src/superblocks/nilfs.c
diff --git a/shlibs/blkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/ntfs.c
rename to libblkid/src/superblocks/ntfs.c
diff --git a/shlibs/blkid/src/superblocks/nvidia_raid.c b/libblkid/src/superblocks/nvidia_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/nvidia_raid.c
rename to libblkid/src/superblocks/nvidia_raid.c
diff --git a/shlibs/blkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/ocfs.c
rename to libblkid/src/superblocks/ocfs.c
diff --git a/shlibs/blkid/src/superblocks/promise_raid.c b/libblkid/src/superblocks/promise_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/promise_raid.c
rename to libblkid/src/superblocks/promise_raid.c
diff --git a/shlibs/blkid/src/superblocks/reiserfs.c b/libblkid/src/superblocks/reiserfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/reiserfs.c
rename to libblkid/src/superblocks/reiserfs.c
diff --git a/shlibs/blkid/src/superblocks/romfs.c b/libblkid/src/superblocks/romfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/romfs.c
rename to libblkid/src/superblocks/romfs.c
diff --git a/shlibs/blkid/src/superblocks/silicon_raid.c b/libblkid/src/superblocks/silicon_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/silicon_raid.c
rename to libblkid/src/superblocks/silicon_raid.c
diff --git a/shlibs/blkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/squashfs.c
rename to libblkid/src/superblocks/squashfs.c
diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/superblocks.c
rename to libblkid/src/superblocks/superblocks.c
diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
similarity index 100%
rename from shlibs/blkid/src/superblocks/superblocks.h
rename to libblkid/src/superblocks/superblocks.h
diff --git a/shlibs/blkid/src/superblocks/swap.c b/libblkid/src/superblocks/swap.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/swap.c
rename to libblkid/src/superblocks/swap.c
diff --git a/shlibs/blkid/src/superblocks/sysv.c b/libblkid/src/superblocks/sysv.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/sysv.c
rename to libblkid/src/superblocks/sysv.c
diff --git a/shlibs/blkid/src/superblocks/ubifs.c b/libblkid/src/superblocks/ubifs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/ubifs.c
rename to libblkid/src/superblocks/ubifs.c
diff --git a/shlibs/blkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/udf.c
rename to libblkid/src/superblocks/udf.c
diff --git a/shlibs/blkid/src/superblocks/ufs.c b/libblkid/src/superblocks/ufs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/ufs.c
rename to libblkid/src/superblocks/ufs.c
diff --git a/shlibs/blkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/vfat.c
rename to libblkid/src/superblocks/vfat.c
diff --git a/shlibs/blkid/src/superblocks/via_raid.c b/libblkid/src/superblocks/via_raid.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/via_raid.c
rename to libblkid/src/superblocks/via_raid.c
diff --git a/shlibs/blkid/src/superblocks/vmfs.c b/libblkid/src/superblocks/vmfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/vmfs.c
rename to libblkid/src/superblocks/vmfs.c
diff --git a/shlibs/blkid/src/superblocks/vxfs.c b/libblkid/src/superblocks/vxfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/vxfs.c
rename to libblkid/src/superblocks/vxfs.c
diff --git a/shlibs/blkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/xfs.c
rename to libblkid/src/superblocks/xfs.c
diff --git a/shlibs/blkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c
similarity index 100%
rename from shlibs/blkid/src/superblocks/zfs.c
rename to libblkid/src/superblocks/zfs.c
diff --git a/shlibs/blkid/src/tag.c b/libblkid/src/tag.c
similarity index 100%
rename from shlibs/blkid/src/tag.c
rename to libblkid/src/tag.c
diff --git a/shlibs/blkid/src/topology/Makefile.am b/libblkid/src/topology/Makefile.am
similarity index 100%
rename from shlibs/blkid/src/topology/Makefile.am
rename to libblkid/src/topology/Makefile.am
diff --git a/shlibs/blkid/src/topology/dm.c b/libblkid/src/topology/dm.c
similarity index 100%
rename from shlibs/blkid/src/topology/dm.c
rename to libblkid/src/topology/dm.c
diff --git a/shlibs/blkid/src/topology/evms.c b/libblkid/src/topology/evms.c
similarity index 100%
rename from shlibs/blkid/src/topology/evms.c
rename to libblkid/src/topology/evms.c
diff --git a/shlibs/blkid/src/topology/ioctl.c b/libblkid/src/topology/ioctl.c
similarity index 100%
rename from shlibs/blkid/src/topology/ioctl.c
rename to libblkid/src/topology/ioctl.c
diff --git a/shlibs/blkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c
similarity index 100%
rename from shlibs/blkid/src/topology/lvm.c
rename to libblkid/src/topology/lvm.c
diff --git a/shlibs/blkid/src/topology/md.c b/libblkid/src/topology/md.c
similarity index 100%
rename from shlibs/blkid/src/topology/md.c
rename to libblkid/src/topology/md.c
diff --git a/shlibs/blkid/src/topology/sysfs.c b/libblkid/src/topology/sysfs.c
similarity index 100%
rename from shlibs/blkid/src/topology/sysfs.c
rename to libblkid/src/topology/sysfs.c
diff --git a/shlibs/blkid/src/topology/topology.c b/libblkid/src/topology/topology.c
similarity index 100%
rename from shlibs/blkid/src/topology/topology.c
rename to libblkid/src/topology/topology.c
diff --git a/shlibs/blkid/src/topology/topology.h b/libblkid/src/topology/topology.h
similarity index 100%
rename from shlibs/blkid/src/topology/topology.h
rename to libblkid/src/topology/topology.h
diff --git a/shlibs/blkid/src/tst_types.c b/libblkid/src/tst_types.c
similarity index 100%
rename from shlibs/blkid/src/tst_types.c
rename to libblkid/src/tst_types.c
diff --git a/shlibs/blkid/src/verify.c b/libblkid/src/verify.c
similarity index 100%
rename from shlibs/blkid/src/verify.c
rename to libblkid/src/verify.c
diff --git a/shlibs/blkid/src/version.c b/libblkid/src/version.c
similarity index 100%
rename from shlibs/blkid/src/version.c
rename to libblkid/src/version.c
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index e976b9971e..4f70da73e7 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -25,9 +25,9 @@ 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"
+TS_HELPER_PARTITIONS="$top_builddir/libblkid/samples/partitions"
 
-U_L_LIBRARY_PATH="$top_builddir/shlibs/blkid/src/.libs:$top_builddir/libuuid/src/.libs"
+U_L_LIBRARY_PATH="$top_builddir/libblkid/src/.libs:$top_builddir/libuuid/src/.libs"
 
 # paths to commands
 TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount/mount"}