[SSSD] [PATCH] BUILD: Install libsss_crypt after its dependencies
Lukas Slebodnik
lslebodn at redhat.com
Mon Dec 8 23:29:20 UTC 2014
ehlo,
review is appreciated.
LS
-------------- next part --------------
>From 63aafdd5d2b7fe57cee8c7b75d9839f3cdeb2a70 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed Dec 3 13:59:24 2014 +0100
Subject: [PATCH] BUILD: Install libsss_crypt after its dependencies
A library should not be installed before it's internal dependencies
otherwise there is an error in make distcheck.
libtool: install: error: relink `libsss_crypt.la' with the above command before
installing it
It would be sufficient just to change order of libraries in
automake variable pkglib_LTLIBRARIES, but it's better to have
internal libraries on the one place.
---
Makefile.am | 67 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 85699d11ed85d4af7b9be5905271e6ce2eba62eb..fcfaf026c46c54a1b22a3c9f3fcce29dcfd4e4dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,39 +293,7 @@ endif
noinst_LTLIBRARIES =
-pkglib_LTLIBRARIES = \
- libsss_crypt.la
-
-if HAVE_NSS
- SSS_CRYPT_SOURCES = src/util/crypto/nss/nss_base64.c \
- src/util/crypto/nss/nss_hmac_sha1.c \
- src/util/crypto/nss/nss_sha512crypt.c \
- src/util/crypto/nss/nss_obfuscate.c \
- src/util/crypto/nss/nss_util.c
- SSS_CRYPT_CFLAGS = $(NSS_CFLAGS)
- SSS_CRYPT_LIBS = $(NSS_LIBS)
-else
- SSS_CRYPT_SOURCES = src/util/crypto/libcrypto/crypto_base64.c \
- src/util/crypto/libcrypto/crypto_hmac_sha1.c \
- src/util/crypto/libcrypto/crypto_sha512crypt.c \
- src/util/crypto/libcrypto/crypto_obfuscate.c
- SSS_CRYPT_CFLAGS = $(CRYPTO_CFLAGS)
- SSS_CRYPT_LIBS = $(CRYPTO_LIBS)
-endif
-
-libsss_crypt_la_SOURCES = \
- $(SSS_CRYPT_SOURCES)
-libsss_crypt_la_CFLAGS = \
- $(SSS_CRYPT_CFLAGS) \
- $(DHASH_CFLAGS)
-libsss_crypt_la_LIBADD = \
- $(SSS_CRYPT_LIBS) \
- $(DHASH_LIBS) \
- $(TALLOC_LIBS) \
- libsss_debug.la \
- $(NULL)
-libsss_crypt_la_LDFLAGS = \
- -avoid-version
+pkglib_LTLIBRARIES =
if BUILD_PYTHON_BINDINGS
pyexec_LTLIBRARIES = \
@@ -682,6 +650,39 @@ libsss_child_la_LIBADD = \
$(NULL)
libsss_child_la_LDFLAGS = -avoid-version
+pkglib_LTLIBRARIES += libsss_crypt.la
+
+if HAVE_NSS
+ SSS_CRYPT_SOURCES = src/util/crypto/nss/nss_base64.c \
+ src/util/crypto/nss/nss_hmac_sha1.c \
+ src/util/crypto/nss/nss_sha512crypt.c \
+ src/util/crypto/nss/nss_obfuscate.c \
+ src/util/crypto/nss/nss_util.c
+ SSS_CRYPT_CFLAGS = $(NSS_CFLAGS)
+ SSS_CRYPT_LIBS = $(NSS_LIBS)
+else
+ SSS_CRYPT_SOURCES = src/util/crypto/libcrypto/crypto_base64.c \
+ src/util/crypto/libcrypto/crypto_hmac_sha1.c \
+ src/util/crypto/libcrypto/crypto_sha512crypt.c \
+ src/util/crypto/libcrypto/crypto_obfuscate.c
+ SSS_CRYPT_CFLAGS = $(CRYPTO_CFLAGS)
+ SSS_CRYPT_LIBS = $(CRYPTO_LIBS)
+endif
+
+libsss_crypt_la_SOURCES = \
+ $(SSS_CRYPT_SOURCES)
+libsss_crypt_la_CFLAGS = \
+ $(SSS_CRYPT_CFLAGS) \
+ $(DHASH_CFLAGS)
+libsss_crypt_la_LIBADD = \
+ $(SSS_CRYPT_LIBS) \
+ $(DHASH_LIBS) \
+ $(TALLOC_LIBS) \
+ libsss_debug.la \
+ $(NULL)
+libsss_crypt_la_LDFLAGS = \
+ -avoid-version
+
pkglib_LTLIBRARIES += libsss_util.la
libsss_util_la_SOURCES = \
src/confdb/confdb.c \
--
2.1.0
More information about the sssd-devel
mailing list