Fixed doc test and rearranged some more things in Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 07131eac962eeda857dd0db0937e4944de680ecf..c44e804e3628a9d988041acb742721bcb8e0f987 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,48 +73,43 @@ COMP_LIB    = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK           = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
 LINK_LIB       = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
                  $(LIBS) -version-number $(version_info) -no-undefined
+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
 .PHONY: install-h uninstall-h install-lib uninstall-lib install-pyldns
 
-all:           include lib linktest manpages @PYLDNS@
+all:           setup-builddir lib linktest manpages @PYLDNS@
 
 .SUFFIXES: .c .o .a .lo .h .i
 
 .c.lo:
        $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $< -o $@
 
-$(LDNS_LOBJS):
+$(LDNS_LOBJS) $(LIBLOBJS) $(DRILL_LOBJS) $(EXAMPLE_LOBJS):
        $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@
 
-compat/tick:
-       if [ ! -e config.h ] ; then ln -s ldns/config.h . ; fi
-       if [ ! -d drill ] ; then mkdir drill ; fi
-       if [ ! -d examples ] ; then mkdir examples ; fi
-       if [ ! -d compat ] ; then mkdir compat ; fi
-       echo ticked > compat/tick
-
-$(LIBLOBJS) $(DRILL_LOBJS) $(EXAMPLE_LOBJS): compat/tick
-       $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@
+setup-builddir:
+       @if [ ! -d compat ] ; then mkdir compat ; fi
+       @if [ ! -d drill ] ; then mkdir drill ; fi
+       @if [ ! -d examples ] ; then mkdir examples ; fi
+       @if [ ! -e config.h ] ; then ln -s ldns/config.h . ; fi
+       @if [ ! -d lib ] ; then ln -s .libs lib ; fi ;
+       @if [ ! -d include ] ; then $(INSTALL) -d include; fi
+       @if [ ! -d include/ldns ] ; then ln -s ../ldns include/ldns || echo "include/ldns exists"; fi
 
-drill: $(DRILL_LOBJS)
+drill: drill/drill
+drill/drill: $(DRILL_LOBJS)
+       $(LINK_EXE) -o drill/drill $(DRILL_LOBJS) $(LIBS) -lldns
 
 examples: $(EXAMPLE_LOBJS)
 
 linktest:      $(srcdir)/linktest.c libldns.la
                $(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(LIBSSL_CPPFLAGS) $(CFLAGS) -lldns $(LIBS) -o linktest
 
-include:
-               if [ ! -d include ] ; then ($(INSTALL) -d include || echo "include exists") ; fi ;
-               if [ ! -d include/ldns ] ; then ln -s ../ldns include/ldns || echo "include/ldns exists" ; fi ;
-
-
 lib:           libldns.la
-               if [ ! -d lib ] ; then ln -s .libs lib ; fi ;           
 
 lib-export-all:        libldns.la-export-all
-               if [ ! -d lib ] ; then ln -s .libs lib ; fi ;           
 
 libldns.la:    $(LDNS_ALL_LOBJS)
                $(LINK_LIB) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) --export-symbols $(srcdir)/ldns_symbols.def -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)

diff --git a/test/09-doc-check.tpkg b/test/09-doc-check.tpkg
index c8d919e573002781d568628504e8c489eb53544a..0088fc6d06e2a02cea3ac4f6b61cd42e2e244c43 100644 (file)
Binary files a/test/09-doc-check.tpkg and b/test/09-doc-check.tpkg differ