build-sys: use top-level directory for libuuid rather than shlibs/uuid

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

diff --git a/Makefile.am b/Makefile.am
index a0271b71961c8b202eb2d84c4aa0123f07ea75c0..77c774db26405d5fc454abaa9c6780dbb6bb0066 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am
 SHLIBS_DIRS =
 
 if BUILD_LIBUUID
-SHLIBS_DIRS += shlibs/uuid
+SHLIBS_DIRS += libuuid
 endif
 
 if BUILD_LIBBLKID

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index b9caad5ab169647a8424c8d021cc00c40ae6bd4d..2c8d9c587edd4f4563073b01a76e43a868dee255 100644 (file)
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -24,9 +24,9 @@ $(ul_libblkid_la):
 
 
 # uuid
-ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
-ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
-ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
+ul_libuuid_srcdir = $(top_srcdir)/libuuid/src
+ul_libuuid_builddir = $(top_builddir)/libuuid/src
+ul_libuuid_la = $(top_builddir)/libuuid/src/libuuid.la
 
 $(ul_libuuid_la):
        $(MAKE) -C $(ul_libuuid_builddir)

diff --git a/configure.ac b/configure.ac
index 12a45e619e7808d0958bce85cbc198ccfc092f23..d3805833200047cfe953897acd40e316d0171c13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1242,10 +1242,10 @@ shlibs/mount/src/libmount.h
 shlibs/mount/docs/Makefile
 shlibs/mount/docs/version.xml
 shlibs/mount/samples/Makefile
-shlibs/uuid/uuid.pc
-shlibs/uuid/Makefile
-shlibs/uuid/man/Makefile
-shlibs/uuid/src/Makefile
+libuuid/uuid.pc
+libuuid/Makefile
+libuuid/man/Makefile
+libuuid/src/Makefile
 sys-utils/Makefile
 term-utils/Makefile
 tests/commands.sh

diff --git a/shlibs/uuid/.gitignore b/libuuid/.gitignore
similarity index 100%
rename from shlibs/uuid/.gitignore
rename to libuuid/.gitignore

diff --git a/shlibs/uuid/COPYING.libuuid b/libuuid/COPYING.libuuid
similarity index 100%
rename from shlibs/uuid/COPYING.libuuid
rename to libuuid/COPYING.libuuid

diff --git a/shlibs/uuid/Makefile.am b/libuuid/Makefile.am
similarity index 100%
rename from shlibs/uuid/Makefile.am
rename to libuuid/Makefile.am

diff --git a/shlibs/uuid/man/.gitignore b/libuuid/man/.gitignore
similarity index 100%
rename from shlibs/uuid/man/.gitignore
rename to libuuid/man/.gitignore

diff --git a/shlibs/uuid/man/Makefile.am b/libuuid/man/Makefile.am
similarity index 100%
rename from shlibs/uuid/man/Makefile.am
rename to libuuid/man/Makefile.am

diff --git a/shlibs/uuid/man/uuid.3 b/libuuid/man/uuid.3
similarity index 100%
rename from shlibs/uuid/man/uuid.3
rename to libuuid/man/uuid.3

diff --git a/shlibs/uuid/man/uuid_clear.3 b/libuuid/man/uuid_clear.3
similarity index 100%
rename from shlibs/uuid/man/uuid_clear.3
rename to libuuid/man/uuid_clear.3

diff --git a/shlibs/uuid/man/uuid_compare.3 b/libuuid/man/uuid_compare.3
similarity index 100%
rename from shlibs/uuid/man/uuid_compare.3
rename to libuuid/man/uuid_compare.3

diff --git a/shlibs/uuid/man/uuid_copy.3 b/libuuid/man/uuid_copy.3
similarity index 100%
rename from shlibs/uuid/man/uuid_copy.3
rename to libuuid/man/uuid_copy.3

diff --git a/shlibs/uuid/man/uuid_generate.3 b/libuuid/man/uuid_generate.3
similarity index 100%
rename from shlibs/uuid/man/uuid_generate.3
rename to libuuid/man/uuid_generate.3

diff --git a/shlibs/uuid/man/uuid_is_null.3 b/libuuid/man/uuid_is_null.3
similarity index 100%
rename from shlibs/uuid/man/uuid_is_null.3
rename to libuuid/man/uuid_is_null.3

diff --git a/shlibs/uuid/man/uuid_parse.3 b/libuuid/man/uuid_parse.3
similarity index 100%
rename from shlibs/uuid/man/uuid_parse.3
rename to libuuid/man/uuid_parse.3

diff --git a/shlibs/uuid/man/uuid_time.3 b/libuuid/man/uuid_time.3
similarity index 100%
rename from shlibs/uuid/man/uuid_time.3
rename to libuuid/man/uuid_time.3

diff --git a/shlibs/uuid/man/uuid_unparse.3 b/libuuid/man/uuid_unparse.3
similarity index 100%
rename from shlibs/uuid/man/uuid_unparse.3
rename to libuuid/man/uuid_unparse.3

diff --git a/shlibs/uuid/src/Makefile.am b/libuuid/src/Makefile.am
similarity index 100%
rename from shlibs/uuid/src/Makefile.am
rename to libuuid/src/Makefile.am

diff --git a/shlibs/uuid/src/clear.c b/libuuid/src/clear.c
similarity index 100%
rename from shlibs/uuid/src/clear.c
rename to libuuid/src/clear.c

diff --git a/shlibs/uuid/src/compare.c b/libuuid/src/compare.c
similarity index 100%
rename from shlibs/uuid/src/compare.c
rename to libuuid/src/compare.c

diff --git a/shlibs/uuid/src/copy.c b/libuuid/src/copy.c
similarity index 100%
rename from shlibs/uuid/src/copy.c
rename to libuuid/src/copy.c

diff --git a/shlibs/uuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
similarity index 100%
rename from shlibs/uuid/src/gen_uuid.c
rename to libuuid/src/gen_uuid.c

diff --git a/shlibs/uuid/src/gen_uuid_nt.c b/libuuid/src/gen_uuid_nt.c
similarity index 100%
rename from shlibs/uuid/src/gen_uuid_nt.c
rename to libuuid/src/gen_uuid_nt.c

diff --git a/shlibs/uuid/src/isnull.c b/libuuid/src/isnull.c
similarity index 100%
rename from shlibs/uuid/src/isnull.c
rename to libuuid/src/isnull.c

diff --git a/shlibs/uuid/src/pack.c b/libuuid/src/pack.c
similarity index 100%
rename from shlibs/uuid/src/pack.c
rename to libuuid/src/pack.c

diff --git a/shlibs/uuid/src/parse.c b/libuuid/src/parse.c
similarity index 100%
rename from shlibs/uuid/src/parse.c
rename to libuuid/src/parse.c

diff --git a/shlibs/uuid/src/tst_uuid.c b/libuuid/src/tst_uuid.c
similarity index 100%
rename from shlibs/uuid/src/tst_uuid.c
rename to libuuid/src/tst_uuid.c

diff --git a/shlibs/uuid/src/unpack.c b/libuuid/src/unpack.c
similarity index 100%
rename from shlibs/uuid/src/unpack.c
rename to libuuid/src/unpack.c

diff --git a/shlibs/uuid/src/unparse.c b/libuuid/src/unparse.c
similarity index 100%
rename from shlibs/uuid/src/unparse.c
rename to libuuid/src/unparse.c

diff --git a/shlibs/uuid/src/uuid.h b/libuuid/src/uuid.h
similarity index 100%
rename from shlibs/uuid/src/uuid.h
rename to libuuid/src/uuid.h

diff --git a/shlibs/uuid/src/uuid.sym b/libuuid/src/uuid.sym
similarity index 100%
rename from shlibs/uuid/src/uuid.sym
rename to libuuid/src/uuid.sym

diff --git a/shlibs/uuid/src/uuidP.h b/libuuid/src/uuidP.h
similarity index 100%
rename from shlibs/uuid/src/uuidP.h
rename to libuuid/src/uuidP.h

diff --git a/shlibs/uuid/src/uuid_time.c b/libuuid/src/uuid_time.c
similarity index 100%
rename from shlibs/uuid/src/uuid_time.c
rename to libuuid/src/uuid_time.c

diff --git a/shlibs/uuid/src/uuidd.h b/libuuid/src/uuidd.h
similarity index 100%
rename from shlibs/uuid/src/uuidd.h
rename to libuuid/src/uuidd.h

diff --git a/shlibs/uuid/uuid.pc.in b/libuuid/uuid.pc.in
similarity index 100%
rename from shlibs/uuid/uuid.pc.in
rename to libuuid/uuid.pc.in

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 41fb436ac966d6563688e04af737157a141d3239..1b04825ff39f38759599524236a4ee8970cb9c4b 100644 (file)
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -27,7 +27,7 @@ TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/shlibs/mount/src/test_tab_diff"
 # TODO: use partx
 TS_HELPER_PARTITIONS="$top_builddir/shlibs/blkid/samples/partitions"
 
-U_L_LIBRARY_PATH="$top_builddir/shlibs/blkid/src/.libs:$top_builddir/shlibs/uuid/src/.libs"
+U_L_LIBRARY_PATH="$top_builddir/shlibs/blkid/src/.libs:$top_builddir/libuuid/src/.libs"
 
 # paths to commands
 TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount/mount"}