X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkmf.m4;h=ced7cd26ab0245c2b32b237244d0a7af8c607452;hb=e49a8dc54782b0ee3abb791774f857a2f8a49f7f;hp=fc86a0e33819390a8ca555f57675a8cd70888658;hpb=6c42fdb026399955c72abfa3ba47144904d93a0a;p=nsc-5.git

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index fc86a0e..ced7cd2 100644
--- a/m4/mkmf.m4
+++ b/m4/mkmf.m4
@@ -1,46 +1,23 @@
 dnl ###
-dnl ### NSC 2.2 -- Makefile Builder
-dnl ### (c) 1997--1999 Martin Mares <mj@ucw.cz>
+dnl ### NSC -- Makefile Builder
+dnl ### (c) 1997--2008 Martin Mares <mj@ucw.cz>
 dnl ###
+include(m4/dnslib.m4)
 
-# Things we allow to override
+# Definition of primary domains; secondaries we needn't take care of
 
-define(`named_restart_cmd', `ndc reload')
+define(`PRIMARIES', `')
 
-# List of all version files available
-
-define(`ALLVERS', CONF CACHE)
-define(`ADDVER', `define(`ALLVERS', ALLVERS` $1')')
-
-# Definition of primary domain
-
-define(`PRIMARY', `divert(0)VERSDIR/$1 ZONEDIR/$1: CFDIR/$1
-	`$'(NSC) CFDIR/$1 >ZONEDIR/$1 -DVERS=VERSDIR/$1
-
-divert(-1)
-ADDVER(VERSDIR/$1)
-')
-
-# Definition of reverse domain
-
-define(`REVCF', ` patsubst(CFDIR/$1,`^cf/\(.*\)\+\(.*\)$',`ZONEDIR/\1+\2')')
-define(`REVERSi', `define(`ev',revaddr($1))define(`ew',`shift(shift($@))')
-divert(0)VERSDIR/ev ZONEDIR/ev:iterate(`REVCF', `ew')
-	`$'(NSC)iterate(`REVCF', `ew') >ZONEDIR/ev -DVERS=VERSDIR/ev -DREVERSE=$2 -DREVBASE=$1
+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)
+	`$'(`M4') -DVERS=VERSDIR/nsc_file_name($1) `$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/nsc_file_name($1)
 
 divert(-1)
-ADDVER(VERSDIR/ev)
+define(`PRIMARIES', PRIMARIES ZONEDIR/nsc_file_name($1))
 ')
 
-define(`REVERSE', `REVERSi($1,$@)')
-define(`PREVERSE', `REVERSi($1,patsubst($1,`^\(.*\)\..*$',`\1'),shift($@))')
-
-# Definition of partial reverse zone delegation (also called classless in-addr.arpa)
-
-define(`PARTIAL', `divert(0)ZONEDIR/$1+$2:
-	`$'(PGEN) >ZONEDIR/$1+$2 -DBASE=revaddr($1) -DFROM=patsubst(`$1', `^.*\.\(.*\)$', `\1') -DCOUNT=$2 -DSERV=shift(shift($@))
-
-divert(-1)')
+define(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'), shift($@))')
 
 # Insertion of raw makefile material
 
@@ -49,30 +26,31 @@ divert(-1)')
 
 # Last words
 
-define(`cleanup', `divert(0)VERSDIR/.version: ALLVERS
-	named_restart_cmd
+define(`nsc_cleanup', `divert(0)VERSDIR/.version: CFDIR/domains ROOTCACHE`'PRIMARIES
+	NAMED_RESTART_CMD
 	touch VERSDIR/.version
 
 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 CONF
+	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
 `#'
 `#'	Nameserver Configuration Makefile
-`#'	Generated by mkmf.m4 on curdate
+`#'	Generated by NSCVER (mkmf.m4) on CURRENT_DATE
 `#'	Please don't edit manually
 `#'
 
-NSC=m4 NSCDIR/dnslib.m4 NSCDIR/nsc.m4
-PGEN=m4 NSCDIR/dnslib.m4 NSCDIR/pgen.m4
+`M4'=M4
+NSC=m4/nsc.m4
+DDEPS=`$'(NSC) m4/dnslib.m4 cf/config
 
 all: VERSDIR/.version
-m4wrap(`cleanup')
+m4wrap(`nsc_cleanup')
 divert(-1)