]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'libtool' of https://github.com/orbea/ldns into orbea-libtool
authorWillem Toorop <willem@nlnetlabs.nl>
Tue, 7 Sep 2021 08:31:37 +0000 (10:31 +0200)
committerWillem Toorop <willem@nlnetlabs.nl>
Tue, 7 Sep 2021 08:31:37 +0000 (10:31 +0200)
1  2 
Makefile.in

diff --cc Makefile.in
index ef4feaea1c96e665294df28992ae1337aaa5bc98,400b593dfa04ff1a1530bdcab68a34ea34c0575f..89fdf387a409005de348889d1df88ca06341d7be
@@@ -324,10 -324,10 +324,10 @@@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrap
        $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
  
  _ldns.la: ldns_wrapper.lo libldns.la
-       $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(PYTHON_LIBS) $(LIBS)
 -      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) $(LIB) $(PYTHON_LIBS) $(LIBS)
  
  $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
-       BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
+       BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="$$BUILDDIR/$(LIB)" INC="-I$$BUILDDIR"
  
  $(p5_dns_ldns_dir)/blib/arch/auto/DNS/LDNS/LDNS.so: $(p5_dns_ldns_dir)/Makefile
        cd $(p5_dns_ldns_dir); $(MAKE)