diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:04:01 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:04:01 +0100 |
| commit | c5c1033c5c7deda8abe3448ec81bbb33c72219e0 (patch) | |
| tree | 6e5cef29b85161eea8a7488a029f5a32f982c6ab /libuuid | |
| parent | 462008f79be9e195670b202cb43827b8aeb1e60b (diff) | |
| parent | 2fb567c080e1762ec6a2147564f03068f55d4f14 (diff) | |
| download | util-linux-baserock/morph.tar.gz | |
Merge branch 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield
Diffstat (limited to 'libuuid')
| -rw-r--r-- | libuuid/COPYING | 4 | ||||
| -rw-r--r-- | libuuid/src/Makemodule.am | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libuuid/COPYING b/libuuid/COPYING index 6935c2889..0e902cf8c 100644 --- a/libuuid/COPYING +++ b/libuuid/COPYING @@ -1,5 +1,5 @@ This library is free software; you can redistribute it and/or modify it under the terms of the Modified BSD License. -The complete text of the license is available at the -Documentation/licenses/COPYING.BSD-3 file. +The complete text of the license is available in the +../Documentation/licenses/COPYING.BSD-3 file. diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am index 73f1ba957..a20cb4ccb 100644 --- a/libuuid/src/Makemodule.am +++ b/libuuid/src/Makemodule.am @@ -29,9 +29,14 @@ libuuid_la_SOURCES = \ libuuid_la_DEPENDENCIES = libuuid/src/uuid.sym libuuid_la_LIBADD = $(SOCKET_LIBS) -libuuid_la_CFLAGS = -I$(ul_libuuid_incdir) -Ilibuuid/src + +libuuid_la_CFLAGS = \ + $(SOLIB_CFLAGS) \ + -I$(ul_libuuid_incdir) \ + -Ilibuuid/src libuuid_la_LDFLAGS = \ + $(SOLIB_LDFLAGS) \ -Wl,--version-script=$(top_srcdir)/libuuid/src/uuid.sym \ -version-info $(LIBUUID_VERSION_INFO) |