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 c16364f98010f6d4d83d736f41dc6b158ca4fa7b..bedb221ad88819e6d21210acd744dfb30853189b 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -15,16 +15,17 @@ 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))
 
 CPROGS=                subseg2display compose-segenco
 
-default:       $(CPROGS) for-test-ui
+default:       $(CPROGS) for-test-ui layers extras
+all:           default lpages
 for-pic:       ours+pindata.asm
 recurse:       $(CPROGS) for-pic for-test-ui
-all:           default lpages layers extras
 for-test-ui:   ours.graph.c ours.redactgraph ours.raw.neato.ps \
                ours.redacted.neato.ps ours.layout-data.o \
                ours.dgram-bot.segcmap ours.dgram-bot.plandata.c \
@@ -32,7 +33,7 @@ for-test-ui:  ours.graph.c ours.redactgraph ours.raw.neato.ps \
 
 layers:                $(LAYERS)
 lpages:                $(LPAGES)
-extras:                dualjn-a.ps parts.ps
+extras:                ours-a.ps ours-al.ps dualjn-a.ps parts.ps
 
 include ours.dgram.m
 include segencolayers.m
@@ -80,10 +81,10 @@ compose-segenco: compose-segenco.o
                $(LINK)
 
 %.d4:          %.m4 $(M4INCS) Makefile
-               m4 -s <$< $o
+               m4 -s $< $o
 
 %-a.ps:                %.d4 layout
-               ./layout <$< $(LAYOUTOPTS) '-E*l' $o
+               ./layout <$< $(LAYOUTOPTS) '-E*lD' $o
 
 %-al.ps:       %.d4 layout
                ./layout <$< $(LAYOUTOPTS) '-e*C' '-ep=rm' $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
@@ -140,7 +145,8 @@ subseg2display.o compose-segenco.o: segcmap.h
 
 clean:
                -rm -f -- *.d4 *~ t.* *.m *.new core
-               -rm -f ours.*.ps parts.ps *.neato.ps ours.*.neato
+               -rm -f ours.*.ps ours-*.ps parts.ps *.neato.ps ours.*.neato
+               -rm -f dualjn-*.ps
                -rm -f *.pin-info *+pindata.asm
                -rm -f *.redacted.forsafety *.redacted.forneato
                -rm -f *.oprint-*.ps *.run-layout