diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2014-12-03 13:59:24 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-12-11 17:37:27 +0100 |
| commit | 25d4435998d0446f7699e7ab0874c7a6f610ab58 (patch) | |
| tree | 3a4f64a52a25850ff97d0719bca834431d182b48 /Makefile.am | |
| parent | f33ddf15796745888d0194a2f80f22bb3b379dec (diff) | |
| download | sssd-25d4435998d0446f7699e7ab0874c7a6f610ab58.tar.gz sssd-25d4435998d0446f7699e7ab0874c7a6f610ab58.tar.xz sssd-25d4435998d0446f7699e7ab0874c7a6f610ab58.zip | |
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.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 85699d11e..fcfaf026c 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 \ |