From 6087f87afb4d8fce0102c52ad2acf415d8d4c0f3 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 1 Nov 2016 19:17:07 -0700 Subject: [PATCH] [master] make uninstall 4503. [cleanup] "make uninstall" now removes file installed by BIND. (This currently excludes Python files due to lack of support in setup.py.) [RT #42912] --- CHANGES | 4 ++ Makefile.in | 7 +++ bin/check/Makefile.in | 7 +++ bin/confgen/Makefile.in | 8 +++ bin/delv/Makefile.in | 4 ++ bin/dig/Makefile.in | 8 +++ bin/dnssec/Makefile.in | 4 ++ bin/named/Makefile.in | 7 +++ bin/nsupdate/Makefile.in | 4 ++ bin/pkcs11/Makefile.in | 14 +++++ bin/python/Makefile.in | 9 +++ bin/rndc/Makefile.in | 5 ++ bin/tests/system/Makefile.in | 2 + bin/tools/Makefile.in | 29 +++++++++ configure | 4 ++ configure.in | 3 + lib/bind9/Makefile.in | 3 + lib/bind9/include/bind9/Makefile.in | 5 ++ lib/dns/Makefile.in | 3 + lib/dns/include/dns/Makefile.in | 8 +++ lib/dns/include/dst/Makefile.in | 5 ++ lib/irs/Makefile.in | 3 + lib/irs/include/irs/Makefile.in | 7 +++ lib/isc/Makefile.in | 3 + lib/isc/alpha/include/isc/Makefile.in | 5 ++ lib/isc/ia64/include/isc/Makefile.in | 5 ++ lib/isc/include/isc/Makefile.in | 6 ++ lib/isc/include/pk11/Makefile.in | 5 ++ lib/isc/include/pkcs11/Makefile.in | 5 ++ lib/isc/mips/include/isc/Makefile.in | 5 ++ lib/isc/noatomic/include/isc/Makefile.in | 5 ++ lib/isc/nothreads/include/isc/Makefile.in | 5 ++ lib/isc/powerpc/include/isc/Makefile.in | 5 ++ lib/isc/pthreads/include/isc/Makefile.in | 5 ++ lib/isc/unix/include/isc/Makefile.in | 5 ++ lib/isc/unix/include/pkcs11/Makefile.in | 5 ++ lib/isc/x86_32/include/isc/Makefile.in | 5 ++ lib/isc/x86_64/include/isc/Makefile.in | 5 ++ lib/isccc/Makefile.in | 3 + lib/isccc/include/isccc/Makefile.in | 5 ++ lib/isccfg/Makefile.in | 3 + lib/isccfg/include/isccfg/Makefile.in | 5 ++ lib/lwres/Makefile.in | 3 + lib/lwres/include/lwres/Makefile.in | 7 +++ lib/lwres/man/Makefile.in | 71 +++++++++++++++++++++++ lib/lwres/unix/include/lwres/Makefile.in | 5 ++ make/rules.in | 3 +- 47 files changed, 331 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 183e6d809f..8cbc7a6655 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4503. [cleanup] "make uninstall" now removes file installed by + BIND. (This currently excludes Python files + due to lack of support in setup.py.) [RT #42912] + 4502. [func] Report multiple and experimental options when printing grammar. [RT #43134] diff --git a/Makefile.in b/Makefile.in index f94e918d8f..ba6153d949 100644 --- a/Makefile.in +++ b/Makefile.in @@ -60,6 +60,13 @@ install:: isc-config.sh installdirs @LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1 ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} +uninstall:: + rm -f ${DESTDIR}${sysconfdir}/bind.keys + rm -f ${DESTDIR}${mandir}/man1/bind9-config.1 + rm -f ${DESTDIR}${mandir}/man1/isc-config.sh.1 + rm -f ${DESTDIR}${bindir}/bind9-config + rm -f ${DESTDIR}${bindir}/isc-config.sh + tags: rm -f TAGS find lib bin -name "*.[ch]" -print | @ETAGS@ - diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index 5d266afb6c..2f9a179fd5 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -87,5 +87,12 @@ install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done (cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8) +uninstall:: + rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8 + for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done + rm -f ${DESTDIR}${sbindir}/named-compilezone@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkconf@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkzone@EXEEXT@ + clean distclean:: rm -f ${TARGETS} r1.htm diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in index cce3c157c3..75b309f225 100644 --- a/bin/confgen/Makefile.in +++ b/bin/confgen/Makefile.in @@ -96,5 +96,13 @@ install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs (cd ${DESTDIR}${sbindir}; rm -f tsig-keygen@EXEEXT@; ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@) (cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8) +uninstall:: + rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8 + rm -f ${DESTDIR}${sbindir}/tsig-keygen@EXEEXT@ + rm -f ${DESTDIR}${mandir}/man8/ddns-confgen.8 + rm -f ${DESTDIR}${mandir}/man8/rndc-confgen.8 + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/ddns-confgen@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/rndc-confgen@EXEEXT@ + clean distclean maintainer-clean:: rm -f ${TARGETS} diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in index 87a1ed8a6f..e14968f711 100644 --- a/bin/delv/Makefile.in +++ b/bin/delv/Makefile.in @@ -65,6 +65,10 @@ install:: delv@EXEEXT@ installdirs delv@EXEEXT@ ${DESTDIR}${bindir} ${INSTALL_DATA} ${srcdir}/delv.1 ${DESTDIR}${mandir}/man1 +uninstall:: + rm -f ${DESTDIR}${mandir}/man1/delv.1 + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/delv@EXEEXT@ + doc man:: ${MANOBJS} docclean manclean maintainer-clean:: diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index 490df4211c..bd219c5d05 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -98,3 +98,11 @@ install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs for m in ${MANPAGES}; do \ ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1; \ done + +uninstall:: + for m in ${MANPAGES}; do \ + rm -f ${DESTDIR}${mandir}/man1/$$m ; \ + done + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/nslookup@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/host@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/dig@EXEEXT@ diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index 24e232365c..8c6627a8d3 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -111,6 +111,10 @@ install:: ${TARGETS} installdirs for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done +uninstall:: + for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done + for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t ; done + clean distclean:: rm -f ${TARGETS} diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index e40dfc64ca..3a11bf5d10 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -172,6 +172,13 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 +uninstall:: + rm -f ${DESTDIR}${mandir}/man5/named.conf.5 + rm -f ${DESTDIR}${mandir}/man8/lwresd.8 + rm -f ${DESTDIR}${mandir}/man8/named.8 + rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@ + @DLZ_DRIVER_RULES@ named-symtbl.@O@: named-symtbl.c diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 292c6f2724..1a5ae2a52e 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -86,3 +86,7 @@ installdirs: install:: nsupdate@EXEEXT@ installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsupdate@EXEEXT@ ${DESTDIR}${bindir} ${INSTALL_DATA} ${srcdir}/nsupdate.1 ${DESTDIR}${mandir}/man1 + +uninstall:: + rm -f ${DESTDIR}${mandir}/man1/nsupdate.1 + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/nsupdate@EXEEXT@ diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in index 8e531810f1..d9aa66bc94 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in @@ -82,5 +82,19 @@ install:: ${TARGETS} installdirs ${INSTALL_DATA} ${srcdir}/pkcs11-keygen.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/pkcs11-tokens.8 ${DESTDIR}${mandir}/man8 +uninstall:: + rm -f ${DESTDIR}${mandir}/man8/pkcs11-tokens.8 + rm -f ${DESTDIR}${mandir}/man8/pkcs11-keygen.8 + rm -f ${DESTDIR}${mandir}/man8/pkcs11-destroy.8 + rm -f ${DESTDIR}${mandir}/man8/pkcs11-list.8 + ${LIBTOOL_MODE_UNINSTALL} rm -f / + ${DESTDIR}${sbindir}/pkcs11-tokens@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f / + ${DESTDIR}${sbindir}/pkcs11-keygen@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f / + ${DESTDIR}${sbindir}/pkcs11-destroy@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f / + ${DESTDIR}${sbindir}/pkcs11-list@EXEEXT@ + clean distclean:: rm -f ${OBJS} ${TARGETS} diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in index bc6c0c9d41..a064c74716 100644 --- a/bin/python/Makefile.in +++ b/bin/python/Makefile.in @@ -59,6 +59,15 @@ install:: ${TARGETS} installdirs fi \ fi +uninstall:: + rm -f ${DESTDIR}${mandir}/man8/dnssec-keymgr.8 + rm -f ${DESTDIR}${mandir}/man8/dnssec-coverage.8 + rm -f ${DESTDIR}${mandir}/man8/dnssec-checkds.8 + rm -f ${DESTDIR}${sbindir}/dnssec-keymgr + rm -f ${DESTDIR}${sbindir}/dnssec-coverage + rm -f ${DESTDIR}${sbindir}/dnssec-checkds + # only manually uninstall for the python package itself + clean distclean:: rm -f ${TARGETS} rm -rf build diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in index d0862e39f2..7a7b13a1a9 100644 --- a/bin/rndc/Makefile.in +++ b/bin/rndc/Makefile.in @@ -79,5 +79,10 @@ install:: rndc@EXEEXT@ installdirs ${INSTALL_DATA} ${srcdir}/rndc.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/rndc.conf.5 ${DESTDIR}${mandir}/man5 +uninstall:: + rm -f ${DESTDIR}${mandir}/man5/rndc.conf.5 + rm -f ${DESTDIR}${mandir}/man8/rndc.8 + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/rndc@EXEEXT@ + clean distclean maintainer-clean:: rm -f ${TARGETS} diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 60bb7e6150..8b454eb2d5 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -61,3 +61,5 @@ distclean:: installdirs: install:: + +uninstall:: diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in index 94b7356a7a..36d7b8dc01 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -149,5 +149,34 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ ${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1 +uninstall:: + rm -f ${DESTDIR}${mandir}/man1/mdig.1 + rm -f ${DESTDIR}${mandir}/man8/genrandom.8 + rm -f ${DESTDIR}${mandir}/man8/nsec3hash.8 + rm -f ${DESTDIR}${mandir}/man1/named-rrchecker.1 + rm -f ${DESTDIR}${mandir}/man8/named-journalprint.8 + rm -f ${DESTDIR}${mandir}/man8/isc-hmac-fixup.8 + rm -f ${DESTDIR}${mandir}/man1/arpaname.1 + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${bindir}/mdig@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${sbindir}/isc-hmac-fixup@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${sbindir}/genrandom@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${sbindir}/nsec3hash@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${bindir}/named-rrchecker@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${sbindir}/named-journalprint@EXEEXT@ + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${bindir}/arpaname@EXEEXT@ + rm -f ${DESTDIR}${mandir}/man1/dnstap-read.1 + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${bindir}/dnstap-read@EXEEXT@ + rm -f ${DESTDIR}${mandir}/man8/named-nzd2nzf.8 + ${LIBTOOL_MODE_UNINSTALL} rm -f \ + ${DESTDIR}${sbindir}/named-nzd2nzf@EXEEXT@ + clean distclean:: rm -f ${TARGETS} diff --git a/configure b/configure index bdeb1d52cf..87f16d07aa 100755 --- a/configure +++ b/configure @@ -795,6 +795,7 @@ ISC_PLATFORM_HAVEIPV6 BIND9_CO_RULE LIBTOOL_IN_MAIN LIBTOOL_ALLOW_UNDEFINED +LIBTOOL_MODE_UNINSTALL LIBTOOL_MODE_LINK LIBTOOL_MODE_INSTALL LIBTOOL_MODE_COMPILE @@ -15640,6 +15641,7 @@ $as_echo "yes" >&6; } LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC' LIBTOOL_MODE_INSTALL='--mode=install --tag=CC' LIBTOOL_MODE_LINK='--mode=link --tag=CC' + LIBTOOL_MODE_UNINSTALL='--mode=uninstall --tag=CC' INSTALL_LIBRARY='${INSTALL_PROGRAM}' case "$host" in *) LIBTOOL_ALLOW_UNDEFINED= ;; @@ -15660,6 +15662,7 @@ $as_echo "no" >&6; } LIBTOOL_MODE_COMPILE= LIBTOOL_MODE_INSTALL= LIBTOOL_MODE_LINK= + LIBTOOL_MODE_UNINSTALL= LIBTOOL_ALLOW_UNDEFINED= LIBTOOL_IN_MAIN= INSTALL_LIBRARY='${INSTALL_DATA}' @@ -17845,6 +17848,7 @@ SA=a + BIND9_CO_RULE=".c.$O:" diff --git a/configure.in b/configure.in index 101e050212..9f6e2775a7 100644 --- a/configure.in +++ b/configure.in @@ -1360,6 +1360,7 @@ case $use_libtool in LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC' LIBTOOL_MODE_INSTALL='--mode=install --tag=CC' LIBTOOL_MODE_LINK='--mode=link --tag=CC' + LIBTOOL_MODE_UNINSTALL='--mode=uninstall --tag=CC' INSTALL_LIBRARY='${INSTALL_PROGRAM}' case "$host" in *) LIBTOOL_ALLOW_UNDEFINED= ;; @@ -1379,6 +1380,7 @@ case $use_libtool in LIBTOOL_MODE_COMPILE= LIBTOOL_MODE_INSTALL= LIBTOOL_MODE_LINK= + LIBTOOL_MODE_UNINSTALL= LIBTOOL_ALLOW_UNDEFINED= LIBTOOL_IN_MAIN= INSTALL_LIBRARY='${INSTALL_DATA}' @@ -2779,6 +2781,7 @@ AC_SUBST(LIBTOOL_MKDEP_SED) AC_SUBST(LIBTOOL_MODE_COMPILE) AC_SUBST(LIBTOOL_MODE_INSTALL) AC_SUBST(LIBTOOL_MODE_LINK) +AC_SUBST(LIBTOOL_MODE_UNINSTALL) AC_SUBST(LIBTOOL_ALLOW_UNDEFINED) AC_SUBST(LIBTOOL_IN_MAIN) diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in index 37f8529df5..a98926e733 100644 --- a/lib/bind9/Makefile.in +++ b/lib/bind9/Makefile.in @@ -72,5 +72,8 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libbind9.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libbind9.@A@ + clean distclean:: rm -f libbind9.@A@ timestamp diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in index c1bb0b7cf1..f223ad3774 100644 --- a/lib/bind9/include/bind9/Makefile.in +++ b/lib/bind9/include/bind9/Makefile.in @@ -31,3 +31,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind9 ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/bind9/$$i ; \ + done diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 7998c41fd5..67ae8c44c5 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -155,6 +155,9 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns.@A@ + clean distclean:: rm -f libdns.@A@ timestamp rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in index afa944a8df..990c030525 100644 --- a/lib/dns/include/dns/Makefile.in +++ b/lib/dns/include/dns/Makefile.in @@ -47,3 +47,11 @@ install:: installdirs for i in ${GENHEADERS}; do \ ${INSTALL_DATA} $$i ${DESTDIR}${includedir}/dns ; \ done + +uninstall:: + for i in ${GENHEADERS}; do \ + rm -f ${DESTDIR}${includedir}/dns/$$i ; \ + done + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/dns/$$i ; \ + done diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in index 4569f44a96..060bb13d7f 100644 --- a/lib/dns/include/dst/Makefile.in +++ b/lib/dns/include/dst/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dst ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/dst/$$i ; \ + done diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in index 35b9452e7e..110e121180 100644 --- a/lib/irs/Makefile.in +++ b/lib/irs/Makefile.in @@ -70,5 +70,8 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libirs.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libirs.@A@ + clean distclean:: rm -f libirs.@A@ libirs.la timestamp diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in index 7ee4bcc90c..4bb5b3d4b9 100644 --- a/lib/irs/include/irs/Makefile.in +++ b/lib/irs/include/irs/Makefile.in @@ -32,5 +32,12 @@ install:: installdirs ${INSTALL_DATA} netdb.h ${DESTDIR}${includedir}/irs ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/irs +uninstall:: + rm -f ${DESTDIR}${includedir}/irs/platform.h + rm -f ${DESTDIR}${includedir}/irs/netdb.h + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/irs/$$i ; \ + done + distclean:: rm -f netdb.h platform.h diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index 7a29a37c49..e5c4db067b 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -133,6 +133,9 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc.@A@ + clean distclean:: rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \ libisc-nosymtbl.la timestamp diff --git a/lib/isc/alpha/include/isc/Makefile.in b/lib/isc/alpha/include/isc/Makefile.in index 0eac507848..0876355a26 100644 --- a/lib/isc/alpha/include/isc/Makefile.in +++ b/lib/isc/alpha/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/ia64/include/isc/Makefile.in b/lib/isc/ia64/include/isc/Makefile.in index 0eac507848..0876355a26 100644 --- a/lib/isc/ia64/include/isc/Makefile.in +++ b/lib/isc/ia64/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index ec339e2261..a6f0f2d279 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -46,5 +46,11 @@ install:: installdirs done ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/isc +uninstall:: + rm -f ${DESTDIR}${includedir}/isc/platform.h + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done + distclean:: rm -f platform.h diff --git a/lib/isc/include/pk11/Makefile.in b/lib/isc/include/pk11/Makefile.in index a514e6ee99..6a4f051cf7 100644 --- a/lib/isc/include/pk11/Makefile.in +++ b/lib/isc/include/pk11/Makefile.in @@ -28,3 +28,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pk11 ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/pk11/$$i ; \ + done diff --git a/lib/isc/include/pkcs11/Makefile.in b/lib/isc/include/pkcs11/Makefile.in index efa87fd7d8..e5f17d3c58 100644 --- a/lib/isc/include/pkcs11/Makefile.in +++ b/lib/isc/include/pkcs11/Makefile.in @@ -30,3 +30,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pkcs11 ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/pkcs11/$$i ; \ + done diff --git a/lib/isc/mips/include/isc/Makefile.in b/lib/isc/mips/include/isc/Makefile.in index 0eac507848..0876355a26 100644 --- a/lib/isc/mips/include/isc/Makefile.in +++ b/lib/isc/mips/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/noatomic/include/isc/Makefile.in b/lib/isc/noatomic/include/isc/Makefile.in index 0eac507848..0876355a26 100644 --- a/lib/isc/noatomic/include/isc/Makefile.in +++ b/lib/isc/noatomic/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in index 91b16d595a..7f09cebe4c 100644 --- a/lib/isc/nothreads/include/isc/Makefile.in +++ b/lib/isc/nothreads/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/powerpc/include/isc/Makefile.in b/lib/isc/powerpc/include/isc/Makefile.in index 0eac507848..0876355a26 100644 --- a/lib/isc/powerpc/include/isc/Makefile.in +++ b/lib/isc/powerpc/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in index d161abb0e6..cf308664c6 100644 --- a/lib/isc/pthreads/include/isc/Makefile.in +++ b/lib/isc/pthreads/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in index 22a380d5bc..9f108665cf 100644 --- a/lib/isc/unix/include/isc/Makefile.in +++ b/lib/isc/unix/include/isc/Makefile.in @@ -27,3 +27,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/unix/include/pkcs11/Makefile.in b/lib/isc/unix/include/pkcs11/Makefile.in index 2e12b9a854..bb31f49cf3 100644 --- a/lib/isc/unix/include/pkcs11/Makefile.in +++ b/lib/isc/unix/include/pkcs11/Makefile.in @@ -23,3 +23,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/pkcs11/$$i ; \ + done diff --git a/lib/isc/x86_32/include/isc/Makefile.in b/lib/isc/x86_32/include/isc/Makefile.in index 0eac507848..0876355a26 100644 --- a/lib/isc/x86_32/include/isc/Makefile.in +++ b/lib/isc/x86_32/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isc/x86_64/include/isc/Makefile.in b/lib/isc/x86_64/include/isc/Makefile.in index 0e93c51ed6..8429c8c500 100644 --- a/lib/isc/x86_64/include/isc/Makefile.in +++ b/lib/isc/x86_64/include/isc/Makefile.in @@ -26,3 +26,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isc/$$i ; \ + done diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 2b67e93505..2637448d63 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -74,5 +74,8 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisccc.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisccc.@A@ + clean distclean:: rm -f libisccc.@A@ timestamp diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in index 1faf6dc01c..abad84efb9 100644 --- a/lib/isccc/include/isccc/Makefile.in +++ b/lib/isccc/include/isccc/Makefile.in @@ -31,3 +31,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccc ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isccc/$$i ; \ + done diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index c15410d013..4fdc0d71fe 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -71,5 +71,8 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisccfg.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisccfg.@A@ + clean distclean:: rm -f libisccfg.@A@ timestamp diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in index 739bb2538b..d1c96c95e9 100644 --- a/lib/isccfg/include/isccfg/Makefile.in +++ b/lib/isccfg/include/isccfg/Makefile.in @@ -32,3 +32,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccfg ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/isccfg/$$i ; \ + done diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in index b031f03059..4acb7485d2 100644 --- a/lib/lwres/Makefile.in +++ b/lib/lwres/Makefile.in @@ -71,5 +71,8 @@ installdirs: install:: timestamp installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} liblwres.@A@ ${DESTDIR}${libdir} +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/liblwres.@A@ + clean distclean:: rm -f liblwres.@A@ liblwres.la timestamp diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in index 73fd8d0a10..834f2f36db 100644 --- a/lib/lwres/include/lwres/Makefile.in +++ b/lib/lwres/include/lwres/Makefile.in @@ -32,5 +32,12 @@ install:: installdirs ${INSTALL_DATA} netdb.h ${DESTDIR}${includedir}/lwres ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/lwres +uninstall:: + rm -f ${DESTDIR}${includedir}/lwres/platform.h + rm -f ${DESTDIR}${includedir}/lwres/netdb.h + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/lwres/$$i ; \ + done + distclean:: rm -f netdb.h platform.h diff --git a/lib/lwres/man/Makefile.in b/lib/lwres/man/Makefile.in index e201467c65..ce8bc09ce5 100644 --- a/lib/lwres/man/Makefile.in +++ b/lib/lwres/man/Makefile.in @@ -227,3 +227,74 @@ install:: installdirs @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_sethostent_r.3 rm -f ${man3}/lwres_string_parse.3 @LN@ ${man3}/lwres_resutil.3 ${man3}/lwres_string_parse.3 + +uninstall:: + for m in ${MANPAGES}; do rm -f ${man3}/$$m ; done + rm -f ${man3}/lwres_addr_parse.3 + rm -f ${man3}/lwres_buffer_add.3 + rm -f ${man3}/lwres_buffer_back.3 + rm -f ${man3}/lwres_buffer_clear.3 + rm -f ${man3}/lwres_buffer_first.3 + rm -f ${man3}/lwres_buffer_forward.3 + rm -f ${man3}/lwres_buffer_getmem.3 + rm -f ${man3}/lwres_buffer_getuint16.3 + rm -f ${man3}/lwres_buffer_getuint32.3 + rm -f ${man3}/lwres_buffer_getuint8.3 + rm -f ${man3}/lwres_buffer_init.3 + rm -f ${man3}/lwres_buffer_invalidate.3 + rm -f ${man3}/lwres_buffer_putmem.3 + rm -f ${man3}/lwres_buffer_putuint16.3 + rm -f ${man3}/lwres_buffer_putuint32.3 + rm -f ${man3}/lwres_buffer_putuint8.3 + rm -f ${man3}/lwres_buffer_subtract.3 + rm -f ${man3}/lwres_conf_clear.3 + rm -f ${man3}/lwres_conf_get.3 + rm -f ${man3}/lwres_conf_init.3 + rm -f ${man3}/lwres_conf_parse.3 + rm -f ${man3}/lwres_conf_print.3 + rm -f ${man3}/lwres_context_allocmem.3 + rm -f ${man3}/lwres_context_create.3 + rm -f ${man3}/lwres_context_destroy.3 + rm -f ${man3}/lwres_context_freemem.3 + rm -f ${man3}/lwres_context_initserial.3 + rm -f ${man3}/lwres_context_nextserial.3 + rm -f ${man3}/lwres_context_sendrecv.3 + rm -f ${man3}/lwres_endhostent.3 + rm -f ${man3}/lwres_endhostent_r.3 + rm -f ${man3}/lwres_freeaddrinfo.3 + rm -f ${man3}/lwres_freehostent.3 + rm -f ${man3}/lwres_gabnrequest_free.3 + rm -f ${man3}/lwres_gabnrequest_parse.3 + rm -f ${man3}/lwres_gabnrequest_render.3 + rm -f ${man3}/lwres_gabnresponse_free.3 + rm -f ${man3}/lwres_gabnresponse_parse.3 + rm -f ${man3}/lwres_gabnresponse_render.3 + rm -f ${man3}/lwres_getaddrsbyname.3 + rm -f ${man3}/lwres_gethostbyaddr.3 + rm -f ${man3}/lwres_gethostbyaddr_r.3 + rm -f ${man3}/lwres_gethostbyname.3 + rm -f ${man3}/lwres_gethostbyname2.3 + rm -f ${man3}/lwres_gethostbyname_r.3 + rm -f ${man3}/lwres_gethostent_r.3 + rm -f ${man3}/lwres_getipnodebyaddr.3 + rm -f ${man3}/lwres_getipnodebyname.3 + rm -f ${man3}/lwres_getnamebyaddr.3 + rm -f ${man3}/lwres_gnbarequest_free.3 + rm -f ${man3}/lwres_gnbarequest_parse.3 + rm -f ${man3}/lwres_gnbarequest_render.3 + rm -f ${man3}/lwres_gnbaresponse_free.3 + rm -f ${man3}/lwres_gnbaresponse_parse.3 + rm -f ${man3}/lwres_gnbaresponse_render.3 + rm -f ${man3}/lwres_herror.3 + rm -f ${man3}/lwres_lwpacket_parseheader.3 + rm -f ${man3}/lwres_lwpacket_renderheader.3 + rm -f ${man3}/lwres_net_ntop.3 + rm -f ${man3}/lwres_nooprequest_free.3 + rm -f ${man3}/lwres_nooprequest_parse.3 + rm -f ${man3}/lwres_nooprequest_render.3 + rm -f ${man3}/lwres_noopresponse_free.3 + rm -f ${man3}/lwres_noopresponse_parse.3 + rm -f ${man3}/lwres_noopresponse_render.3 + rm -f ${man3}/lwres_sethostent.3 + rm -f ${man3}/lwres_sethostent_r.3 + rm -f ${man3}/lwres_string_parse.3 diff --git a/lib/lwres/unix/include/lwres/Makefile.in b/lib/lwres/unix/include/lwres/Makefile.in index 3c3ef5e5c3..7e66e69c98 100644 --- a/lib/lwres/unix/include/lwres/Makefile.in +++ b/lib/lwres/unix/include/lwres/Makefile.in @@ -23,3 +23,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/lwres ; \ done + +uninstall:: + for i in ${HEADERS}; do \ + rm -f ${DESTDIR}${includedir}/lwres/$$i ; \ + done diff --git a/make/rules.in b/make/rules.in index 18602f057e..6a127bd54f 100644 --- a/make/rules.in +++ b/make/rules.in @@ -76,7 +76,7 @@ testdirs: install:: all -install clean distclean maintainer-clean doc docclean man manclean:: +install uninstall clean distclean maintainer-clean doc docclean man manclean:: @for i in ${ALL_SUBDIRS} ${ALL_TESTDIRS}; do \ if [ "$$i" != "nulldir" -a -d $$i ]; then \ echo "making $@ in `pwd`/$$i"; \ @@ -133,6 +133,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_MODE_COMPILE = ${LIBTOOL} @LIBTOOL_MODE_COMPILE@ LIBTOOL_MODE_INSTALL = ${LIBTOOL} @LIBTOOL_MODE_INSTALL@ LIBTOOL_MODE_LINK = ${LIBTOOL} @LIBTOOL_MODE_LINK@ +LIBTOOL_MODE_UNINSTALL = ${LIBTOOL} @LIBTOOL_MODE_UNINSTALL@ PURIFY = @PURIFY@ MKDEP = ${SHELL} ${top_builddir}/make/mkdep