diff options
Diffstat (limited to 'libdane')
| -rw-r--r-- | libdane/Makefile.am | 19 | ||||
| -rw-r--r-- | libdane/includes/Makefile.am | 6 |
2 files changed, 8 insertions, 17 deletions
diff --git a/libdane/Makefile.am b/libdane/Makefile.am index d880cc8aaa..debf502def 100644 --- a/libdane/Makefile.am +++ b/libdane/Makefile.am @@ -32,13 +32,8 @@ AM_CPPFLAGS = \ SUBDIRS = includes -defexecdir = $(bindir) -defexec_DATA = - - libgnutls_dane_la_LDFLAGS = -no-undefined -if ENABLE_DANE lib_LTLIBRARIES = libgnutls-dane.la libgnutls_dane_la_SOURCES = dane.c dane-params.c errors.c libdane.map @@ -56,16 +51,16 @@ else libgnutls_dane_la_LDFLAGS += -export-symbols-regex '^(dane).*' endif +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gnutls-dane.pc +DISTCLEANFILES = $(pkgconfig_DATA) + if HAVE_LD_OUTPUT_DEF libgnutls_dane_la_LDFLAGS += \ -Wl,--output-def,libgnutls-dane-$(DLL_VERSION).def libgnutls_dane-$(DLL_VERSION).def: libgnutls-dane.la -defexec_DATA += libgnutls-dane-$(DLL_VERSION).def -endif -endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gnutls-dane.pc -DISTCLEANFILES = $(pkgconfig_DATA) +defexecdir = $(bindir) +defexec_DATA = libgnutls-dane-$(DLL_VERSION).def DISTCLEANFILES += $(defexec_DATA) +endif diff --git a/libdane/includes/Makefile.am b/libdane/includes/Makefile.am index 59fdcbe6ed..e67c5029d8 100644 --- a/libdane/includes/Makefile.am +++ b/libdane/includes/Makefile.am @@ -18,8 +18,4 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <http://www.gnu.org/licenses/> -nobase_include_HEADERS = - -if ENABLE_DANE -nobase_include_HEADERS += gnutls/dane.h -endif +nobase_include_HEADERS = gnutls/dane.h |