adnslogres new -C option

[adns.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a0f13df640d7889e636111530fccf3d0fa416bf9..4bfb72fee0ff3ae78df2cc624af740caeb12a2df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,12 @@
 # Makefile - top-level Makefile
-# 
-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
 #  
+#  This file is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+# 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
@@ -16,12 +21,18 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-DISTVERSION=   0.3
-
+DISTVERSION=   0.9
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
-SUBDIRS= src dynamic client regress
+ENABLE_DYNAMIC=        @ENABLE_DYNAMIC@
+ifeq ($(ENABLE_DYNAMIC),elf)
+SUBDIRS_DYNAMIC=dynamic
+else
+SUBDIRS_DYNAMIC=
+endif
+
+SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
 
 all install uninstall clean distclean mostlyclean maintainer-clean distprep:
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
@@ -30,7 +41,7 @@ all install uninstall clean distclean mostlyclean maintainer-clean distprep:
 all-here install-here uninstall-here distprep-here:    README
 
 clean-here mostlyclean-here:
-               rm -f *~ ./#*# core *.orig *.rej Makefile adns-*.tar.gz
+               rm -f *~ ./#*# core *.orig *.rej adns-*.tar.gz
                rm -rf dist_tmp
 
 distclean-here maintainer-clean-here:  clean-here
@@ -40,13 +51,14 @@ install-strip:
        $(MAKE) INSTALL_PROGRAM_FLAGS=-s
 
 dist_tmp=dist_tmp/adns-$(DISTVERSION)
-dist:                  distclean distprep
+dist:                  distprep
        rm -rf dist_tmp*
        mkdir dist_tmp $(dist_tmp)
        find \( -name CVS -o -name dist_tmp* \) -prune -o -type d -print | \
                sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh
        find \( -name CVS -o -name dist_tmp* \) -prune -o -type f -print | \
                sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
+       $(MAKE) -C dist_tmp/adns-$(DISTVERSION) distclean
        cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
        gzip -9 $(dist_tmp).tar
        mv $(dist_tmp).tar.gz .