diff options
| author | Daniel Salzman <daniel.salzman@nic.cz> | 2019-01-21 15:04:36 +0100 |
|---|---|---|
| committer | Daniel Salzman <daniel.salzman@nic.cz> | 2019-01-24 16:55:22 +0100 |
| commit | ff0cdb7ffed90017d031a386216a6d444d54ff88 (patch) | |
| tree | 1571bc1a67c79fe0a93c71bde2d365d7a2d267ae /src/libdnssec | |
| parent | Merge branch 'trie_shallow_copy' into 'master' (diff) | |
| download | knot-ff0cdb7ffed90017d031a386216a6d444d54ff88.tar.xz knot-ff0cdb7ffed90017d031a386216a6d444d54ff88.zip | |
libdnssec: dissolve libshared in libdnssec to fix linking issues with Clang
Diffstat (limited to 'src/libdnssec')
| -rw-r--r-- | src/libdnssec/Makefile.inc | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/libdnssec/Makefile.inc b/src/libdnssec/Makefile.inc index 820fd7fbb..339298ca7 100644 --- a/src/libdnssec/Makefile.inc +++ b/src/libdnssec/Makefile.inc @@ -1,25 +1,9 @@ lib_LTLIBRARIES += libdnssec.la pkgconfig_DATA += libdnssec.pc -noinst_LTLIBRARIES += libshared.la - -libshared_la_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) - -libshared_la_SOURCES = \ - libdnssec/shared/bignum.c \ - libdnssec/shared/bignum.h \ - libdnssec/shared/binary_wire.h \ - libdnssec/shared/dname.c \ - libdnssec/shared/dname.h \ - libdnssec/shared/keyid_gnutls.c \ - libdnssec/shared/keyid_gnutls.h \ - libdnssec/shared/pem.c \ - libdnssec/shared/pem.h \ - libdnssec/shared/shared.h - libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS) libdnssec_la_LDFLAGS = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS) -libdnssec_la_LIBADD = libshared.la libcontrib.la $(gnutls_LIBS) +libdnssec_la_LIBADD = libcontrib.la $(gnutls_LIBS) if ENABLE_PKCS11 libdnssec_la_LIBADD += $(pthread_LIBS) endif @@ -68,6 +52,16 @@ libdnssec_la_SOURCES = \ libdnssec/p11/p11.c \ libdnssec/p11/p11.h \ libdnssec/random.c \ + libdnssec/shared/bignum.c \ + libdnssec/shared/bignum.h \ + libdnssec/shared/binary_wire.h \ + libdnssec/shared/dname.c \ + libdnssec/shared/dname.h \ + libdnssec/shared/keyid_gnutls.c \ + libdnssec/shared/keyid_gnutls.h \ + libdnssec/shared/pem.c \ + libdnssec/shared/pem.h \ + libdnssec/shared/shared.h \ libdnssec/sign/der.c \ libdnssec/sign/der.h \ libdnssec/sign/sign.c \ |