#664: libunbound-Python: libldns is not used anymore.

git-svn-id: file:///svn/unbound/trunk@3402 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index e129e0d0ec1568e607c3bed7c57c3dea9725e8bf..57e575f5fe40e8608b6cf9e93025b4e3693cba8d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
        - Fix bug#664: libunbound python3 related fixes (from Tomas Hozza)
          Use print_function also for Python2.
          libunbound examples: produce sorted output.
+         libunbound-Python: libldns is not used anymore.
 
 10 April 2015: Wouter
        - unbound-control ratelimit_list lists high rate domains.

diff --git a/libunbound/python/Makefile b/libunbound/python/Makefile
index 86ba1774707abe4b4a4a1ca8da51c41c294b0706..01b057731fe238166a7f1fa5e5c7cbc5ef85ca35 100644 (file)
--- a/libunbound/python/Makefile
+++ b/libunbound/python/Makefile
@@ -48,17 +48,14 @@ help:
 #../../.libs/libunbound.so.0:  ../../Makefile
        #$(MAKE) -C ../..
 
-#../../ldns-src/lib/libldns.so:        ../../ldns-src/Makefile
-       #$(MAKE) -C ../../ldns-src
-
 clean:
        rm -rdf examples/unbound
        rm -f _unbound.so libunbound_wrap.o
        $(MAKE) -C ../.. clean
 
-testenv: ../../.libs/libunbound.so.2 ../../ldns-src/lib/libldns.so ../../.libs/_unbound.so
+testenv: ../../.libs/libunbound.so.2 ../../.libs/_unbound.so
        rm -rdf examples/unbound
-       cd examples && mkdir unbound && ln -s ../../unbound.py unbound/__init__.py && ln -s ../../_unbound.so unbound/_unbound.so && ln -s ../../../../.libs/libunbound.so.2 unbound/libunbound.so.2 && ln -s ../../../../ldns-src/lib/libldns.so.1 unbound/libldns.so.1 && ls -la
+       cd examples && mkdir unbound && ln -s ../../unbound.py unbound/__init__.py && ln -s ../../_unbound.so unbound/_unbound.so && ln -s ../../../../.libs/libunbound.so.2 unbound/libunbound.so.2 && ls -la
        cd examples && if test -f ../../../.libs/_unbound.so; then cp ../../../.libs/_unbound.so . ; fi
        @echo "Run a script by typing ./script_name.py"
        cd examples && LD_LIBRARY_PATH=unbound bash