Commit ff0cdb7f authored by Daniel Salzman's avatar Daniel Salzman

libdnssec: dissolve libshared in libdnssec to fix linking issues with Clang

parent 9895e0f2
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 \
......
......@@ -134,7 +134,7 @@ kzonecheck_CPPFLAGS = $(AM_CPPFLAGS)
kzonecheck_LDADD = libcontrib.la libknotd.la
keymgr_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS)
keymgr_LDADD = libcontrib.la libknotd.la libknotus.la libdnssec.la \
libshared.la libzscanner.la
libzscanner.la
kjournalprint_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS)
kjournalprint_LDADD = libcontrib.la libknotd.la
endif HAVE_UTILS
......
......@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
LDADD = \
libtap.la \
$(top_builddir)/src/libknot.la \
$(top_builddir)/src/libshared.la \
$(top_builddir)/src/libdnssec.la \
$(top_builddir)/src/libcontrib.la \
$(top_builddir)/src/libzscanner.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment