X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkmf.m4;h=07340616744acf7834051a8e2ec2c6a568f1a911;hb=817b3d16bda0f6aeddda3e4d9c9d7c84bdcdeed6;hp=19942c5a93732fee72808897702fce3bec45b31c;hpb=ad59bf15d0e8a781477a25f69b97f7d4c9eb0e00;p=nsc-5.git

diff --git a/m4/mkmf.m4 b/m4/mkmf.m4
index 19942c5..0734061 100644
--- 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--2019 Martin Mares <mj@ucw.cz>
 dnl ###
 include(m4/dnslib.m4)
 
@@ -8,17 +8,25 @@ include(m4/dnslib.m4)
 
 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(`PRIMARY', `divert(0)ZONEDIR/$1:nsc_prepend_cf_multi($@) $(DDEPS)
-	`$'(NSC)nsc_prepend_cf_multi($@) >ZONEDIR/$1 -DVERS=VERSDIR/$1
+define(`nsc_key_dep', `ifelse(USE_DNSSEC,,,` 'khash/$1 keys/resign-stamp)')
+define(`PRIMARY', `define(`CURRENT_TARGET',zone/nsc_file_name($1))
+divert(0)CURRENT_TARGET:nsc_prepend_cf_multi($@)nsc_key_dep($1) $(DDEPS)
+	@bin/genzone nsc_file_name($1)`'nsc_prepend_cf_multi($@)
 
 divert(-1)
-define(`PRIMARIES', PRIMARIES ZONEDIR/$1)
+define(`PRIMARIES', PRIMARIES zone/nsc_file_name($1))
 ')
 
 define(`REVERSE', `PRIMARY(nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'), shift($@))')
 
+define(`BLACKHOLE', `define(`NEED_BLACKHOLE', 1)')
+
+define(`DSFOR', `divert(0)CURRENT_TARGET: dss/$1
+
+divert(-1)')
+
 # Insertion of raw makefile material
 
 define(`MAKEFILE', `divert(0)$1
@@ -26,18 +34,25 @@ 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
+ver/.version: CFDIR/domains`'PRIMARIES`'ifdef(`NEED_BLACKHOLE',` zone/blackhole')
 	NAMED_RESTART_CMD
-	touch VERSDIR/.version
+	touch ver/.version
+
+keys/resign-stamp:
+	touch `$'@
 
 clean:
-	find BAKDIR ZONEDIR -type f -maxdepth 1 | xargs rm -f
+	find bak zone hash tmp -maxdepth 1 -type f | xargs rm -f
 
 clobber: clean
-	rm -f Makefile named.conf
+	rm -f Makefile named.conf bin/shell-env
 
 distclean: clobber
-	find VERSDIR -type f -maxdepth 1 | xargs rm -f
+	find ver -maxdepth 1 -type f | xargs rm -f
 ')
 
 divert(0)dnl
@@ -47,10 +62,8 @@ 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
+all: ver/.version
 m4wrap(`nsc_cleanup')
 divert(-1)