From: Willem Toorop <willem@NLnetLabs.nl>
Date: Wed, 30 Nov 2011 10:22:35 +0000 (+0000)
Subject: A few [ leftovers and some more minor cleaning up of Makefile.in
X-Git-Tag: release-1.6.12~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21ebfe23d998f4f9c5f37db1053b27929dc7e08a;p=thirdparty%2Fldns.git

A few [ leftovers and some more minor cleaning up of Makefile.in
---

diff --git a/Makefile.in b/Makefile.in
index 9ee60cea..459aba4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,6 @@ LIBSSL_LDFLAGS  = @LIBSSL_LDFLAGS@
 LIBSSL_LIBS     = @LIBSSL_LIBS@
 RUNTIME_PATH	= @RUNTIME_PATH@
 LIBTOOL		= $(libtool) --tag=CC --quiet
-INSTALL_LDNS_CONFIG = @INSTALL_LDNS_CONFIG@
 LINT		= splint
 LINTFLAGS	= +quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc -Drlimit=rlimit64 -D__gnuc_va_list=va_list
 LINTFLAGS	+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int" -DPQ_64BIT=uint64_t -DRC4_INT=unsigned -fixedformalarray -D"ENGINE=unsigned" -D"RSA=unsigned" -D"DSA=unsigned" -D"EVP_PKEY=unsigned" -D"EVP_MD=unsigned" -D"SSL=unsigned" -D"SSL_CTX=unsigned" -D"X509=unsigned" -D"RC4_KEY=unsigned" -D"EVP_MD_CTX=unsigned" -D"EC_KEY=unsigned" -D"EC_POINT=unsigned" -D"EC_GROUP=unsigned" -D"EVP_PKEY_ASN1_METHOD=struct evp_pkey_asn1_method_st" -D"EVP_PKEY_CTX=struct evp_pkey_ctx_st"
@@ -98,20 +97,20 @@ $(LDNS_LOBJS) $(LIBLOBJS) $(DRILL_LOBJS) $(EXAMPLE_LOBJS):
 	$(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@
 
 setup-builddir:
-	@if test ! -d compat ; then mkdir compat ; fi
-	@if test ! -d drill ; then mkdir drill ; fi
-	@if test ! -d examples ; then mkdir examples ; fi
-	@if test ! -e config.h ; then ln -s ldns/config.h . ; fi
-	@if test ! -d lib ; then ln -s .libs lib ; fi ;
-	@if test ! -d include ; then $(INSTALL) -d include; fi
-	@if test ! -d include/ldns ; then ln -s ../ldns include/ldns || echo "include/ldns exists"; fi
+	if test ! -d compat ; then mkdir compat ; fi
+	if test ! -d drill ; then mkdir drill ; fi
+	if test ! -d examples ; then mkdir examples ; fi
+	if test ! -e config.h ; then ln -s ldns/config.h . ; fi
+	if test ! -d lib ; then ln -s .libs lib ; fi ;
+	if test ! -d include ; then $(INSTALL) -d include; fi
+	if test ! -d include/ldns ; then ln -s ../ldns include/ldns || echo "include/ldns exists"; fi
 
 putdown-builddir:
 	rm -f include/ldns lib config.h
-	@rmdir include  || :
-	@rmdir examples || :
-	@rmdir drill    || :
-	@rmdir compat   || :
+	test ! -d include  || rmdir include  || :
+	test ! -d examples || rmdir examples || :
+	test ! -d drill    || rmdir drill    || :
+	test ! -d compat   || rmdir compat   || :
 
 drill: drill/drill
 drill/drill: $(DRILL_LOBJS) $(LIB)
@@ -126,8 +125,8 @@ install-drill: drill/drill
 
 uninstall-drill:
 	rm -f $(DESTDIR)$(bindir)/drill $(DESTDIR)$(mandir)/man1/drill.1
-	[ ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
-	[ ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
+	test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
+	test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
 
 clean-drill:
 	$(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill
@@ -152,134 +151,131 @@ uninstall-examples:
 	for p in $(EX_PROGS_BASENM) ldns-testns ; do \
 		rm -f $(DESTDIR)$(bindir)/$$p $(DESTDIR)$(mandir)/man1/$$p.1 ;\
 	done
-	[ ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
-	[ ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
+	test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
+	test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
 
 clean-examples:
 	$(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS) $(TESTNS)
 	$(LIBTOOL) --mode clean rm -f $(EXAMPLE_LOBJS)
 
-linktest:	$(srcdir)/linktest.c libldns.la
-		$(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(LIBSSL_CPPFLAGS) $(CFLAGS) -lldns $(LIBS) -o linktest
+linktest: $(srcdir)/linktest.c libldns.la
+	$(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(LIBSSL_CPPFLAGS) $(CFLAGS) -lldns $(LIBS) -o linktest
 
-lib:		libldns.la
+lib: libldns.la
 
-lib-export-all:	libldns.la-export-all
+lib-export-all: libldns.la-export-all
 
-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)
+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)
 
-libldns.la-export-all:	$(LDNS_ALL_LOBJS)
-		$(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)
+libldns.la-export-all: $(LDNS_ALL_LOBJS)
+	$(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)
 
 mancheck:
-		sh -c 'find . -name \*.\[13\] -exec troff -z {} \;' 2>&1 | sed "s/^\.\///" | sed "s/\(:[0\-9]\+:\)/\1 warning:/g"
+	sh -c 'find . -name \*.\[13\] -exec troff -z {} \;' 2>&1 | sed "s/^\.\///" | sed "s/\(:[0\-9]\+:\)/\1 warning:/g"
 
-doxygen:	manpages
-		if test ! -e doc/header.html ; then \
-			$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
-		fi ;
-		$(doxygen) $(srcdir)/libdns.doxygen
+doxygen: manpages
+	if test ! -e doc/header.html ; then \
+		$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
+	fi ;
+	$(doxygen) $(srcdir)/libdns.doxygen
 
-doc:		manpages $(doxygen)
-		$(INSTALL) -d doc
+doc: manpages $(doxygen)
+	$(INSTALL) -d doc
 
-manpages:	$(srcdir)/doc/function_manpages 
-		$(INSTALL) -d doc
-		cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | \
-		grep -v ^doxygen | grep -v ^cat  > doc/ldns_manpages
+manpages: $(srcdir)/doc/function_manpages 
+	$(INSTALL) -d doc
+	cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | \
+	grep -v ^doxygen | grep -v ^cat  > doc/ldns_manpages
 
-pyldns:		_ldns.la
+pyldns: _ldns.la
 
-$(pywrapdir)/ldns_wrapper.c:	$(PYLDNS_I_FILES) ldns/config.h
+$(pywrapdir)/ldns_wrapper.c: $(PYLDNS_I_FILES) ldns/config.h
 	$(swig) $(swigpy_flags) -o $@ $(CPPFLAGS) $(PYTHON_CPPFLAGS) $(pywrapdir)/ldns.i
 
-ldns_wrapper.lo:	$(pywrapdir)/ldns_wrapper.c ldns/config.h
+ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
 	$(COMP_LIB) -I./include/ldns $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $< -o $@
 
 _ldns.la: ldns_wrapper.lo libldns.la 
 	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-number $(version_info) -no-undefined -o $@ $< -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
 
-install:	install-h install-lib install-config install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_DRILL@ @INSTALL_EXAMPLES@
+install: install-h install-lib @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_DRILL@ @INSTALL_EXAMPLES@
 
-uninstall:	uninstall-manpages uninstall-config uninstall-h uninstall-lib $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@
+uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@
 
-destclean:	uninstall
+destclean: uninstall
 
 install-config:
-	if test $(INSTALL_LDNS_CONFIG) = "yes" ; then \
-		$(INSTALL) -d $(DESTDIR)$(bindir) ; \
-		$(INSTALL) -c -m 755 packaging/ldns-config $(DESTDIR)$(bindir)/ ; \
-	fi
+	$(INSTALL) -d $(DESTDIR)$(bindir)
+	$(INSTALL) -c -m 755 packaging/ldns-config $(DESTDIR)$(bindir)
 
 uninstall-config:
-	if test $(INSTALL_LDNS_CONFIG) = "yes" ; then \
-		rm -f $(DESTDIR)$(bindir)/ldns-config; \
-		[ ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || echo "ok, dir already gone"; \
-	fi
+	rm -f $(DESTDIR)$(bindir)/ldns-config
+	test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || echo "ok, dir already gone"
+
+install-config-manpage:
+	${INSTALL} -d $(DESTDIR)$(mandir)/man1
+	${INSTALL} -c -m 444 $(srcdir)/packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/
+
+
+uninstall-config-manpage:
+	rm -f $(DESTDIR)$(mandir)/man1/ldns-config.1
+	test ! -d $(DESTDIR)$(mandir)/man1 || rmdir -p $(DESTDIR)$(mandir)/man1 || echo "ok, dir already gone"
+
+install-manpages: manpages  @INSTALL_CONFIG_MANPAGE@
+	${INSTALL} -d $(DESTDIR)$(mandir)/man3
+	for f in doc/man/man3/*; do \
+		${INSTALL} -c -m 444 $$f $(DESTDIR)$(mandir)/man3/; \
+	done
+
+uninstall-manpages: @UNINSTALL_CONFIG_MANPAGE@
+	for m in `cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | grep -v ^doxygen | grep -v ^cat` ; do \
+		rm -f $(DESTDIR)$(mandir)/man3/$$m.3 ; done
+	test ! -d $(DESTDIR)$(mandir)/man3 || rmdir -p $(DESTDIR)$(mandir)/man3 || echo "ok, dir already gone"
 
-install-manpages:	manpages
-		${INSTALL} -d $(DESTDIR)$(mandir)/man3
-		for f in doc/man/man3/*; do \
-			${INSTALL} -c -m 444 $$f $(DESTDIR)$(mandir)/man3/; \
-		done
-		if test $(INSTALL_LDNS_CONFIG) = "yes" ; then \
-			${INSTALL} -d $(DESTDIR)$(mandir)/man1; \
-			${INSTALL} -c -m 444 $(srcdir)/packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \
-		fi
-
-uninstall-manpages:
-		for m in `cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | grep -v ^doxygen | grep -v ^cat` ; do \
-			rm -f $(DESTDIR)$(mandir)/man3/$$m.3 ; done
-		rmdir -p $(DESTDIR)$(mandir)/man3 || echo "ok, dir already gone"
-		if test $(INSTALL_LDNS_CONFIG) = "yes" ; then \
-			rm -f $(DESTDIR)$(mandir)/man1/ldns-config.1; \
-			[ ! -d $(DESTDIR)$(mandir)/man1 || rmdir -p $(DESTDIR)$(mandir)/man1 || echo "ok, dir already gone"; \
-		fi
-
-install-h:	lib
-		$(INSTALL) -m 755 -d $(DESTDIR)$(includedir)/ldns
-		for i in $(LDNS_HEADERS); do \
-			$(INSTALL) -c -m 644 $(srcdir)/ldns/$$i $(DESTDIR)$(includedir)/ldns/; done
-		for i in $(LDNS_HEADERS_GEN); do \
-			$(INSTALL) -c -m 644 ldns/$$i $(DESTDIR)$(includedir)/ldns/; done
+install-h: lib
+	$(INSTALL) -m 755 -d $(DESTDIR)$(includedir)/ldns
+	for i in $(LDNS_HEADERS); do \
+		$(INSTALL) -c -m 644 $(srcdir)/ldns/$$i $(DESTDIR)$(includedir)/ldns/; done
+	for i in $(LDNS_HEADERS_GEN); do \
+		$(INSTALL) -c -m 644 ldns/$$i $(DESTDIR)$(includedir)/ldns/; done
 
 uninstall-h:
-		for i in $(LDNS_HEADERS) $(LDNS_HEADERS_GEN); do \
-			rm -f $(DESTDIR)$(includedir)/ldns/$$i; done
-		[ ! -d $(DESTDIR)$(includedir)/ldns || rmdir -p $(DESTDIR)$(includedir)/ldns || echo "ok, dir already gone"
-		exit 0
+	for i in $(LDNS_HEADERS) $(LDNS_HEADERS_GEN); do \
+		rm -f $(DESTDIR)$(includedir)/ldns/$$i; done
+	test ! -d $(DESTDIR)$(includedir)/ldns || rmdir -p $(DESTDIR)$(includedir)/ldns || echo "ok, dir already gone"
+	exit 0
 
-install-lib:	lib
-		$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
-		$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)
-		$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
+install-lib: lib
+	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 uninstall-lib:	
-		$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libldns.la
-		rmdir -p $(DESTDIR)$(libdir) || echo "ok, dir already gone"
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libldns.la
+	test ! -d $(DESTDIR)$(libdir) || rmdir -p $(DESTDIR)$(libdir) || echo "ok, dir already gone"
 
 install-pyldns: @PYLDNS@
-		$(INSTALL) -m 755 -d $(DESTDIR)$(python_site)/ldns
-		$(INSTALL) -c -m 644 $(pywrapdir)/ldns.py $(DESTDIR)$(python_site)/ldns.py
-		$(LIBTOOL) --mode=install cp _ldns.la $(DESTDIR)$(python_site)
-		$(LIBTOOL) --mode=finish $(DESTDIR)$(python_site)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(python_site)/ldns
+	$(INSTALL) -c -m 644 $(pywrapdir)/ldns.py $(DESTDIR)$(python_site)/ldns.py
+	$(LIBTOOL) --mode=install cp _ldns.la $(DESTDIR)$(python_site)
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(python_site)
 
 uninstall-pyldns:	
-		rm -f $(DESTDIR)$(python_site)/ldns/*
-		rmdir $(DESTDIR)$(python_site)/ldns || echo "ok, dir already gone"
+	rm -f $(DESTDIR)$(python_site)/ldns/*
+	test ! -d $(DESTDIR)$(python_site)/ldns || rmdir $(DESTDIR)$(python_site)/ldns || echo "ok, dir already gone"
 
 install-pyldnsx:
-		$(INSTALL) -c -m 644 $(pyldnsxwrapdir)/ldnsx.py $(DESTDIR)$(python_site)/ldnsx.py
+	$(INSTALL) -c -m 644 $(pyldnsxwrapdir)/ldnsx.py $(DESTDIR)$(python_site)/ldnsx.py
 
 uninstall-pyldnsx:
-		rm -f $(DESTDIR)$(python_site)/ldnsx.py
+	rm -f $(DESTDIR)$(python_site)/ldnsx.py
 
 clean-manpages:
 	for m in `cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | grep -v ^doxygen | grep -v ^cat` ; do\
 		rm -f doc/man/man3/$${m}.3 ; done
 	rm -f doc/ldns_manpages
-	rmdir -p doc/man/man3 || :
+	test ! -d doc/man/man3 || rmdir -p doc/man/man3 || :
 
 clean-lib:
 	$(LIBTOOL) --mode clean rm -f $(LDNS_LOBJS) $(LIBLOBJS)
@@ -299,7 +295,7 @@ realclean: clean docclean
 	rm -f ldns/net.h
 	rm -f packaging/ldns-config
 	rm -f packaging/libldns.pc
-	@rmdir packaging || :
+	test ! -d packaging || rmdir packaging || :
 	rm -f libtool
 	if test -d ldns ; then \
 		echo "is builddir srcdir" > ldns/YES ; \
@@ -311,7 +307,7 @@ realclean: clean docclean
 			for f in `(cd $(srcdir); echo ldns/*.h)`; do \
 				rm -f $$f ; done ; \
 			rm -f ldns/YES; \
-			rmdir ldns || : ; \
+			test ! -d ldns || rmdir ldns || : ; \
                 fi ;\
 	fi
 
diff --git a/configure.ac b/configure.ac
index 97f01d12..09409525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,21 @@ else
 	AC_SUBST(CLEAN_EXAMPLES,[""])
 fi
 
+# add option to disable installation of ldns-config script
+AC_ARG_ENABLE(ldns-config, [ --disable-ldns-config	disable installation of ldns-config (default=enabled)],
+	enable_ldns_config=$enableval, enable_ldns_config=yes)
+if test "x$enable_ldns_config" = xyes; then
+	AC_SUBST(INSTALL_CONFIG, [install-config])
+	AC_SUBST(INSTALL_CONFIG_MANPAGE, [install-config-manpage])
+	AC_SUBST(UNINSTALL_CONFIG, [install-config])
+	AC_SUBST(UNINSTALL_CONFIG_MANPAGE, [install-config-manpage])
+else
+	AC_SUBST(INSTALL_CONFIG, [""])
+	AC_SUBST(INSTALL_CONFIG_MANPAGE, [""])
+	AC_SUBST(UNINSTALL_CONFIG, [""])
+	AC_SUBST(UNINSTALL_CONFIG_MANPAGE, [""])
+fi
+
 # check for python
 PYTHON_X_CFLAGS=""
 ldns_with_pyldns=no
@@ -299,16 +314,6 @@ CPPFLAGS=$tmp_CPPFLAGS
 LDFLAGS=$tmp_LDFLAGS
 LIBS=$tmp_LIBS
 
-# add option to disable installation of ldns-config script
-AC_ARG_ENABLE(ldns-config, [ --disable-ldns-config	disable installation of ldns-config (default=enabled)],
-	enable_ldns_config=$enableval, enable_ldns_config=yes)
-if test "x$enable_ldns_config" = xyes; then
-	INSTALL_LDNS_CONFIG="yes"
-else
-	INSTALL_LDNS_CONFIG="no"
-fi
-AC_SUBST(INSTALL_LDNS_CONFIG)
-
 # add option to disable the evil rpath
 ACX_ARG_RPATH