Blackhole: One more rewrite

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

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 19942c5a93732fee72808897702fce3bec45b31c..fd4ca8755a75c6fa2036492976b2bda5964ab712 100644 (file)
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- Makefile Builder
 dnl ###
 dnl ### NSC -- Makefile Builder

-dnl ### (c) 1997--2003 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2008 Martin Mares <mj@ucw.cz>

 dnl ###
 include(m4/dnslib.m4)
 
 dnl ###
 include(m4/dnslib.m4)
 


@@ -8,17 +8,19 @@ include(m4/dnslib.m4)
 
 define(`PRIMARIES', `')
 
 
 define(`PRIMARIES', `')
 

-define(`nsc_prepend_cf_one', ` 'CFDIR/`$1')
+define(`nsc_prepend_cf_one', ` 'CFDIR/`nsc_file_name($1)')

 define(`nsc_prepend_cf_multi', `nsc_iterate(`nsc_prepend_cf_one', $@)')
 define(`nsc_prepend_cf_multi', `nsc_iterate(`nsc_prepend_cf_one', $@)')

-define(`PRIMARY', `divert(0)ZONEDIR/$1:nsc_prepend_cf_multi($@) $(DDEPS)
-       `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/$1 -DVERS=VERSDIR/$1
+define(`PRIMARY', `divert(0)ZONEDIR/nsc_file_name($1):nsc_prepend_cf_multi($@) $(DDEPS)
+       `$'(`M4') -DVERS=VERSDIR/nsc_file_name($1) `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/nsc_file_name($1)

 
 divert(-1)
 
 divert(-1)

-define(`PRIMARIES', PRIMARIES ZONEDIR/$1)
+define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))

 ')
 
 define(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'), shift($@))')
 
 ')
 
 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
 # Insertion of raw makefile material
 
 define(`MAKEFILE', `divert(0)$1


@@ -26,18 +28,22 @@ divert(-1)')
 
 # Last words
 
 
 # Last words
 

-define(`nsc_cleanup', `divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES
+define(`nsc_cleanup', `
+ifdef(`NEED_BLACKHOLE', `PRIMARY(blackhole)')
+
+divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` ZONEDIR/blackhole')

        NAMED_RESTART_CMD
        touch VERSDIR/.version
        NAMED_RESTART_CMD
        touch VERSDIR/.version

+')dnl

 
 clean:
 
 clean:

-       find BAKDIR ZONEDIR -type f -maxdepth 1 | xargs rm -f
+       find BAKDIR ZONEDIR -maxdepth 1 -type f | xargs rm -f

 
 clobber: clean
        rm -f Makefile named.conf
 
 distclean: clobber
 
 clobber: clean
        rm -f Makefile named.conf
 
 distclean: clobber

-       find VERSDIR -type f -maxdepth 1 | xargs rm -f
+       find VERSDIR -maxdepth 1 -type f | xargs rm -f

 ')
 
 divert(0)dnl
 ')
 
 divert(0)dnl


@@ -48,8 +54,8 @@ divert(0)dnl
 `#'
 
 `M4'=M4
 `#'
 
 `M4'=M4

-NSC=$(`M4') m4/nsc.m4
-DDEPS=m4/nsc.m4 m4/dnslib.m4 cf/config
+NSC=m4/nsc.m4
+DDEPS=`$'(NSC) m4/dnslib.m4 cf/config

 
 all: VERSDIR/.version
 m4wrap(`nsc_cleanup')
 
 all: VERSDIR/.version
 m4wrap(`nsc_cleanup')