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

Signed-off-by: Karel Zak <kzak@redhat.com>
2011-06-09 21:54:05 +02:00 · 2011-06-09 21:54:05 +02:00 · 83d20837dc
parent 8b467e7de8
commit 83d20837dc
36 changed files with 9 additions and 9 deletions
--- 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
--- 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)
--- 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
--- a/shlibs/uuid/.gitignore
+++ b/shlibs/uuid/.gitignore
--- a/shlibs/uuid/COPYING.libuuid
+++ b/shlibs/uuid/COPYING.libuuid
--- a/shlibs/uuid/Makefile.am
+++ b/shlibs/uuid/Makefile.am
--- a/shlibs/uuid/man/.gitignore
+++ b/shlibs/uuid/man/.gitignore
--- a/shlibs/uuid/man/Makefile.am
+++ b/shlibs/uuid/man/Makefile.am
--- a/shlibs/uuid/man/uuid.3
+++ b/shlibs/uuid/man/uuid.3
--- a/shlibs/uuid/man/uuid_clear.3
+++ b/shlibs/uuid/man/uuid_clear.3
--- a/shlibs/uuid/man/uuid_compare.3
+++ b/shlibs/uuid/man/uuid_compare.3
--- a/shlibs/uuid/man/uuid_copy.3
+++ b/shlibs/uuid/man/uuid_copy.3
--- a/shlibs/uuid/man/uuid_generate.3
+++ b/shlibs/uuid/man/uuid_generate.3
--- a/shlibs/uuid/man/uuid_is_null.3
+++ b/shlibs/uuid/man/uuid_is_null.3
--- a/shlibs/uuid/man/uuid_parse.3
+++ b/shlibs/uuid/man/uuid_parse.3
--- a/shlibs/uuid/man/uuid_time.3
+++ b/shlibs/uuid/man/uuid_time.3
--- a/shlibs/uuid/man/uuid_unparse.3
+++ b/shlibs/uuid/man/uuid_unparse.3
--- a/shlibs/uuid/src/Makefile.am
+++ b/shlibs/uuid/src/Makefile.am
--- a/shlibs/uuid/src/clear.c
+++ b/shlibs/uuid/src/clear.c
--- a/shlibs/uuid/src/compare.c
+++ b/shlibs/uuid/src/compare.c
--- a/shlibs/uuid/src/copy.c
+++ b/shlibs/uuid/src/copy.c
--- a/shlibs/uuid/src/gen_uuid.c
+++ b/shlibs/uuid/src/gen_uuid.c
--- a/shlibs/uuid/src/gen_uuid_nt.c
+++ b/shlibs/uuid/src/gen_uuid_nt.c
--- a/shlibs/uuid/src/isnull.c
+++ b/shlibs/uuid/src/isnull.c
--- a/shlibs/uuid/src/pack.c
+++ b/shlibs/uuid/src/pack.c
--- a/shlibs/uuid/src/parse.c
+++ b/shlibs/uuid/src/parse.c
--- a/shlibs/uuid/src/tst_uuid.c
+++ b/shlibs/uuid/src/tst_uuid.c
--- a/shlibs/uuid/src/unpack.c
+++ b/shlibs/uuid/src/unpack.c
--- a/shlibs/uuid/src/unparse.c
+++ b/shlibs/uuid/src/unparse.c
--- a/shlibs/uuid/src/uuid.h
+++ b/shlibs/uuid/src/uuid.h
--- a/shlibs/uuid/src/uuid.sym
+++ b/shlibs/uuid/src/uuid.sym
--- a/shlibs/uuid/src/uuidP.h
+++ b/shlibs/uuid/src/uuidP.h
--- a/shlibs/uuid/src/uuid_time.c
+++ b/shlibs/uuid/src/uuid_time.c
--- a/shlibs/uuid/src/uuidd.h
+++ b/shlibs/uuid/src/uuidd.h
--- a/shlibs/uuid/uuid.pc.in
+++ b/shlibs/uuid/uuid.pc.in
--- 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"}