diff options
| author | Karel Zak <kzak@redhat.com> | 2009-07-06 00:03:35 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2009-07-06 00:03:35 +0200 |
| commit | fd0e397bb0ca6a37d1f94dde3bff870590ab481d (patch) | |
| tree | a59611a097a3a2130c73756f81ddf8ef313622c9 /shlibs/uuid | |
| parent | 30688dde55f637c9b984809c685b61378b82805f (diff) | |
| download | util-linux-old-fd0e397bb0ca6a37d1f94dde3bff870590ab481d.tar.gz | |
libuuid: fix parallel building
and remove some obsolete stuff from blkid/uuid Makefiles.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/uuid')
| -rw-r--r-- | shlibs/uuid/src/Makefile.am | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am index 843328de..1272180e 100644 --- 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: |