libuuid: fix parallel building

 and remove some obsolete stuff from blkid/uuid Makefiles.

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

diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index bd51dd98cbf4883e7032871166f78c9d6f318300..d9970d2295fe817af68cd76db37c41524c32178a 100644 (file)
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -46,7 +46,7 @@ CLEANFILES = $(tests)
 
 tests: all $(tests)
 test_%: %.c
-       $(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(common_ldadd)
+       $(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(UUID_LIBS)
 
 
 # move lib from $(usrlib_execdir) to $(libdir) if needed

diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am
index 843328defe4237a4d84bf73a9fbe61e185dbc856..1272180e25345302a45095691f88186e751077a8 100644 (file)
--- a/shlibs/uuid/src/Makefile.am
+++ b/shlibs/uuid/src/Makefile.am
@@ -3,8 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am
 AM_CPPFLAGS += -I$(ul_libuuid_srcdir)
 
 noinst_PROGRAMS = tst_uuid
-tst_uuid_LDADD = $(ul_libuuid_la)
-tst_uuid_CFLAGS = -I$(ul_libuuid_srcdir)
+tst_uuid_LDADD = libuuid.la #$(ul_libuuid_la)
 
 # includes
 uuidincdir = $(includedir)/uuid
@@ -15,20 +14,12 @@ libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
            isnull.c pack.c parse.c unpack.c unparse.c uuidd.h \
            uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
 
-libuuid_la_DEPENDENCIES = $(libuuid_la_LIBADD) uuid.sym
+libuuid_la_DEPENDENCIES = uuid.sym
 
 libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
                      -version-info 1:0:0
 
-#tests = test_uuid_time
-
 EXTRA_DIST = uuid.sym gen_uuid_nt.c
-CLEANFILES = $(tests)
-
-tests: all $(tests)
-test_%: %.c
-       $(COMPILE) -DTEST_PROGRAM $< .libs/libuuid.a -o $@
-
 
 # move lib from $(usrlib_execdir) to $(libdir) if needed
 install-exec-hook: