Makefile.m4: Make the LaTeX documnt be optional.

[zones] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 49b4376ec6a0c03edd83145ae1aa271ef42639e9..eee02913cd9a1acf3d35dcbaf0b6cb4dcc1275b1 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -22,11 +22,12 @@ $1_ZONE_FILES = _dolist([_subnet], [($2)],
 ALL_SUBNETS += $($1_SUBNETS)
 ALL_ZONES += $($1_ZONES)
 ALL_ZONE_FILES += $($1_ZONE_FILES)
+ALL_CLEAN_FILES += _dolist([_subnet], [($2)], [ _subnet/*])
 m4_divert(30)m4_dnl
 $($1_ZONE_FILES): $1.lisp $(ZONEDEPS)
        mkdir -p $($1_SUBNETS)m4_dnl
 _dolist([_subnet], [($2)], [
-       $(ZONE) -d _subnet/ -s _subnet $1.lisp])
+       $(ZONE) -d _subnet/ -f subnet/_subnet -s _subnet $1.lisp])
 _undivert[]m4_dnl
 ])
 
@@ -35,8 +36,10 @@ m4_divert(-1)
 ### Domains.
 
 DOMAIN([distorted], [inet, fretwank],
-       [distorted.org.uk, 198.29.172.in-addr.arpa, 199.29.172.in-addr.arpa])
-DOMAIN([harlequin], [inet], [harlequin.org.uk])
+       [distorted.org.uk, io.distorted.org.uk, dhcp.distorted.org.uk,
+        198.29.172.in-addr.arpa,
+        199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])
+DOMAIN([harlequin], [inet, fretwank], [harlequin.org.uk])
 
 m4_divert(0)
 ###--------------------------------------------------------------------------
@@ -46,6 +49,7 @@ ZONE = zone
 
 ALL_ZONES =
 ALL_ZONE_FILES =
+ALL_CLEAN_FILES =
 ALL_SUBNETS =
 
 PUBLISH = publish
@@ -60,7 +64,8 @@ m4_divert(20)
 ###--------------------------------------------------------------------------
 ### Rules
 
-all: $(ALL_ZONE_FILES) $(DOC_OUTPUTS)
+all: $(ALL_ZONE_FILES)
+doc: $(DOC_OUTPUTS)
 
 install: all
        ##
@@ -114,7 +119,8 @@ Makefile: Makefile.m4
        mv $@.new $@
 
 clean:
-       rm -f $(ALL_ZONE_FILES) *.toc *.lof *.lot *.log *.dvi *.ps *.aux
+       rm -f $(ALL_ZONE_FILES) $(ALL_CLEAN_FILES) \
+               *.toc *.lof *.lot *.log *.dvi *.ps *.aux
        rmdir $(sort $(ALL_SUBNETS))
 
 ###----- That's all, folks --------------------------------------------------