new ours-m<layer>.ps files for layout editing; pass input file to m4 by name rather...

[trains.git] / layout / Makefile

diff --git a/layout/Makefile b/layout/Makefile
index c0d1c17dab13604f08e71b1b79280c16535a7158..bedb221ad88819e6d21210acd744dfb30853189b 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -15,7 +15,8 @@ LAYERS_LS=    0 10 20
 LAYERS_PS=     $(addsuffix .ps, $(LAYERS_LS))
 LAYERS_L=      $(addprefix ours-l, $(LAYERS_PS))
 LAYERS_E=      $(addprefix ours-e, $(LAYERS_PS))
-LAYERS=                $(LAYERS_L) $(LAYERS_E)
+LAYERS_M=      $(addprefix ours-m, $(LAYERS_PS))
+LAYERS=                $(LAYERS_L) $(LAYERS_E) $(LAYERS_M)
 
 LPAGES=         $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p0-$xx$y.ps))
 
@@ -80,7 +81,7 @@ compose-segenco: compose-segenco.o
                $(LINK)
 
 %.d4:          %.m4 $(M4INCS) Makefile
-               m4 -s <$< $o
+               m4 -s $< $o
 
 %-a.ps:                %.d4 layout
                ./layout <$< $(LAYOUTOPTS) '-E*lD' $o
@@ -116,6 +117,10 @@ ours.graph.c:      extractgraph ours.dgram-bot.p0.segenco.ps
 ours-l%.ps:    ours.d4 layout
                ./layout <$< -l$* $(LAYOUTOPTS) $(XLAYOUTOPTS_LAYER) $o
 
+ours-m%.ps:    ours.d4 layout
+               ./layout <$< -l$* -E'=*aRscLDMno' \
+                       -e'p=*rm' -E'=5RNLDA' -E'*~=5rCdsml' $o
+
 ours-e%.ps:    ours.d4 layout
                ./layout <$< -l$* -E'=*aRsclMno' \
                        -e'p=*rm' -e'=5RN' -E'*~=5rsm' -e'p~=5r' -e'*=*l' $o