From: Willem Toorop Date: Wed, 16 Nov 2011 21:49:06 +0000 (+0000) Subject: Prevent compat files from building again and again and provide include dir so $(srcdi... X-Git-Tag: release-1.6.12~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6103b9d161bc70f139b213f5b635d8ae947f7e8;p=thirdparty%2Fldns.git Prevent compat files from building again and again and provide include dir so $(srcdir) can be used as if ldns was installed there. --- diff --git a/Makefile.in b/Makefile.in index 427dd7ae..07131eac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,7 @@ LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ .PHONY: install uninstall install-doc uninstall-doc uninstall-pyldns .PHONY: install-h uninstall-h install-lib uninstall-lib install-pyldns -all: lib linktest manpages @PYLDNS@ +all: include lib linktest manpages @PYLDNS@ .SUFFIXES: .c .o .a .lo .h .i @@ -88,13 +88,14 @@ all: lib linktest manpages @PYLDNS@ $(LDNS_LOBJS): $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@ -compat: +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 +$(LIBLOBJS) $(DRILL_LOBJS) $(EXAMPLE_LOBJS): compat/tick $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@ drill: $(DRILL_LOBJS) @@ -104,6 +105,11 @@ 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 ;