From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Wed, 21 Sep 2005 10:12:24 +0000 (+0000)
Subject: if you use libtoolize -c then the tarball from make release should be able to compile... 
X-Git-Tag: release-1.0.0~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea24db0e97c69e402fdf12c5a772e04acbccb294;p=thirdparty%2Fldns.git

if you use libtoolize -c then the tarball from make release should be able to compile without doing autoreconf and libtoolize now
---

diff --git a/Makefile.in b/Makefile.in
index 84341274..15dd5c18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@ LDFLAGS		= @LDFLAGS@	-lcrypto
 LIBS 		= @LIBS@
 LIBOBJS		= @LIBOBJS@
 DATE		= $(shell date +%Y%m%d)
-LIBTOOL		= ./libtool
+LIBTOOL		= libtool --tag=CXX
 
 LINT		= splint
 LINTFLAGS	= +quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t 
@@ -143,13 +143,13 @@ install-lib:	lib
 uninstall-lib:	
 		$(LIBTOOL) --mode=uninstall rm $(prefix)/lib/libldns.la
 
-snapshot:	realclean
+snapshot:	distclean
 		(rm -rf ../ldns-snap-$(DATE)/)
 		(cd .. ; cp -r $(basesrcdir)/ ldns-snap-$(DATE)/)
 		(cd .. ; tar --verbose  --exclude ".svn" --exclude "*.key" --exclude "*.private" --create --exclude "lua" --file ldns-snap-$(DATE).tar.gz --gzip ldns-snap-$(DATE)/)
 		(rm -rf ../ldns-snap-$(DATE)/)
 
-release:	realclean
+release:	distclean
 		(cd drill ; $(MAKE) allclean; exit 0)
 		(rm -rf ../ldns-$(VERSION)/)
 		(cd .. ; cp -r $(basesrcdir)/ ldns-$(VERSION)/)
@@ -192,10 +192,15 @@ clean:
 	rm -f *.ds
 	rm -f *.private
 
+distclean: clean docclean libclean
+	rm -f ltmain.sh
+	(cd drill ; $(MAKE) -f Makefile clean)
+
 realclean: clean docclean libclean
 	rm -f config.status
 	rm -f config.log
 	rm -f Makefile
+	rm -f ldns/config.h.in
 	rm -f ldns/config.h
 	rm -f ldns/util.h
 	rm -f config.h.in
@@ -203,7 +208,7 @@ realclean: clean docclean libclean
 	rm -f config.sub
 	rm -f config.guess
 	rm -f ltmain.sh
-	(cd drill ; $(MAKE) -f Makefile clean)
+	(cd drill ; $(MAKE) -f Makefile realclean)
 
 docclean:
 	rm -rf doc/html/
diff --git a/README b/README
index 6eba3635..bc381019 100644
--- a/README
+++ b/README
@@ -6,6 +6,10 @@ On that page you can also subscribe to the ldns mailing list.
 * Development
 ldns is developed on Linux and FreeBSD.
 
+REQUIREMENTS
+- OpenSSL
+- libtool package
+
 INSTALLATION
 1. Unpack the tarball
 2. cd ldns-<VERSION>
diff --git a/drill/Makefile.in b/drill/Makefile.in
index 9ab33a13..825558b8 100644
--- a/drill/Makefile.in
+++ b/drill/Makefile.in
@@ -29,7 +29,7 @@ LIBSRC=$(LIBOBJ:.o=.c)
 
 HEADER=drill.h drill_util.h
 
-.PHONY:	all clean allclean docclean doc release tags install
+.PHONY:	all clean realclean docclean doc release tags install
 
 all:	drill 
 
@@ -61,7 +61,7 @@ clean:
 docclean:
 	rm -rf doxydoc
 
-allclean: clean docclean
+realclean: clean docclean
 	rm -f tags
 	rm -f config.log
 	rm -f config.status