| diff -ru ldns-1.8.3.orig/Makefile.in ldns-1.8.3/Makefile.in |
| |
| |
| @@ -27,6 +27,7 @@ |
| pyldnsx_uninst = @PYLDNSXUNINST@ |
| libtool = @libtool@ |
| CONFIG_FILES = @CONFIG_FILES@ |
| +top_builddir = @top_builddir@ |
| |
| LDNS_TRUST_ANCHOR_FILE = @LDNS_TRUST_ANCHOR_FILE@ |
| DEFAULT_CAFILE = @DEFAULT_CAFILE@ |
| @@ -119,7 +120,7 @@ |
| COMP_LIB = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) |
| LINK = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) |
| LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-info $(version_info) -no-undefined |
| -LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBSSL_LDFLAGS) |
| +LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) |
| |
| .PHONY: clean realclean docclean manpages doc lint all lib pyldns test |
| .PHONY: install uninstall install-doc uninstall-doc uninstall-pyldns |
| @@ -168,7 +169,7 @@ |
| fi |
| |
| drill/drill: $(DRILL_LOBJS) $(LIB) $(LIBLOBJS) |
| - $(LINK_EXE) $(DRILL_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o drill/drill |
| + $(LINK_EXE) $(DRILL_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) -o drill/drill $(top_builddir)/libldns.la |
| |
| drill/drill.1: $(srcdir)/drill/drill.1.in |
| $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1 |
| @@ -200,23 +201,23 @@ |
| |
| # Need LIBSSL_LIBS |
| $(EXAMPLE_PROGS): |
| - $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ |
| + $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ $(top_builddir)/libldns.la |
| |
| # Need LIBSSL_LIBS |
| $(TESTNS): |
| - $(LINK_EXE) $(TESTNS_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $(TESTNS) |
| + $(LINK_EXE) $(TESTNS_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $(TESTNS) $(top_builddir)/libldns.la |
| |
| # Need LIBSSL_LIBS |
| $(LDNS_DPA): |
| $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBLOBJS) $(LIB) $(LIBPCAP_LIBS) $(LIBSSL_LIBS) $(LIBS) \ |
| - -o $(LDNS_DPA) |
| + -o $(LDNS_DPA) $(top_builddir)/libldns.la |
| |
| $(LDNS_DANE): |
| $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_SSL_LIBS) $(LIBS) \ |
| - -o $(LDNS_DANE) |
| + -o $(LDNS_DANE) $(top_builddir)/libldns.la |
| |
| $(EX_SSL_PROGS): |
| - $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ |
| + $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ $(top_builddir)/libldns.la |
| |
| examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in |
| $(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1 |
| @@ -251,14 +252,14 @@ |
| |
| linktest: $(srcdir)/linktest.c libldns.la |
| $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo |
| - $(LINK_EXE) linktest.lo $(LIB) $(LIBSSL_LIBS) $(LIBS) -o linktest |
| + $(LINK_EXE) linktest.lo $(LIB) $(LIBSSL_LIBS) $(LIBS) -o linktest $(top_builddir)/libldns.la |
| |
| lib: libldns.la |
| |
| lib-export-all: libldns.la-export-all |
| |
| libldns.la: $(LDNS_ALL_LOBJS) |
| - $(LINK_LIB) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) |
| + $(LINK_LIB) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) |
| |
| libldns.la-export-all: $(LDNS_ALL_LOBJS) |
| $(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) |