Preparing for release of version 4.0

[nsc-5.git] / m4 / mkmf.m4

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 36c3b8f8a59ef41942c10013c26a9a6749e4f76e..d224efa9b440421249b8d245cfc3d9165d71afe9 100644 (file)
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- Makefile Builder
-dnl ### (c) 1997--2003 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2011 Martin Mares <mj@ucw.cz>
 dnl ###
 include(m4/dnslib.m4)
 
@@ -11,7 +11,7 @@ define(`PRIMARIES', `')
 define(`nsc_prepend_cf_one', ` 'CFDIR/`nsc_file_name($1)')
 define(`nsc_prepend_cf_multi', `nsc_iterate(`nsc_prepend_cf_one', $@)')
 define(`PRIMARY', `divert(0)ZONEDIR/nsc_file_name($1):nsc_prepend_cf_multi($@) $(DDEPS)
-       `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/nsc_file_name($1) -DVERS=VERSDIR/nsc_file_name($1)
+       @bin/genzone nsc_file_name($1)`'nsc_prepend_cf_multi($@)
 
 divert(-1)
 define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))
@@ -19,6 +19,8 @@ define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))
 
 define(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'), shift($@))')
 
+define(`BLACKHOLE', `define(`NEED_BLACKHOLE', 1)')
+
 # Insertion of raw makefile material
 
 define(`MAKEFILE', `divert(0)$1
@@ -26,18 +28,22 @@ divert(-1)')
 
 # Last words
 
-define(`nsc_cleanup', `divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES
+define(`nsc_cleanup', `
+ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
+
+divert(0)dnl
+VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')
        NAMED_RESTART_CMD
        touch VERSDIR/.version
 
 clean:
-       find BAKDIR ZONEDIR -type f -maxdepth 1 | xargs rm -f
+       find BAKDIR ZONEDIR HASHDIR -maxdepth 1 -type f | xargs rm -f
 
 clobber: clean
-       rm -f Makefile named.conf
+       rm -f Makefile named.conf bin/genzone
 
 distclean: clobber
-       find VERSDIR -type f -maxdepth 1 | xargs rm -f
+       find VERSDIR -maxdepth 1 -type f | xargs rm -f
 ')
 
 divert(0)dnl
@@ -47,8 +53,6 @@ divert(0)dnl
 `#'    Please don't edit manually
 `#'
 
-`M4'=M4
-NSC=$(`M4') m4/nsc.m4
 DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
 
 all: VERSDIR/.version