m% does not include loc labels and bars

[trains.git] / layout / Makefile

diff --git a/layout/Makefile b/layout/Makefile
index b0d5b996b480ebf18f30194c176ce4e78077174b..38149353601110a9e4bfa5e099f5dc83f95d624e 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -1,4 +1,5 @@
-#include ../cprogs.make
+include ../cprogs.make
+include ../common.make
 
 M4INCS=                parts.i4
 
@@ -14,34 +15,39 @@ 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
-all:           default lpages layers extras
+default:       $(CPROGS) for-test-ui layers extras
+all:           default lpages
+for-pic:       ours+pindata.asm
+recurse:       $(CPROGS) for-pic for-test-ui
 for-test-ui:   ours.graph.c ours.redactgraph ours.raw.neato.ps \
-               ours.dgram-bot.segcmap subseg2display ui-plan-bot.ppm
+               ours.redacted.neato.ps ours.layout-data.o \
+               ours.dgram-bot.segcmap ours.dgram-bot.plandata.c \
+               ours.dgram-bot.plandata.o
 
 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
 
-o=>$@.new && mv -f $@.new $@
+NETPBM =       -lnetpbm
+ifeq (,$(shell test -f /usr/lib/libppm.so || echo no))
+NETPBM +=      -lppm
+endif
 
-CFLAGS=                -Wall -Wwrite-strings -Wpointer-arith \
-               -Wstrict-prototypes -Wmissing-prototypes \
-               -Wmissing-declarations -Werror $(OPTIMISE)
-OPTIMISE=      -O2 -g
-CPPFLAGS=      -D_GNU_SOURCE
-LINK=          $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
-NETPBM=                -lnetpbm
-# -lppm
+REDACT=                consistency movfeatsplitedges   \
+               consistency movfeatrmstubs      \
+               consistency movfeatsplitnodes   \
+               consistency trivpairnodes       \
+               consistency trivnullnodes
 
 subseg2display:        subseg2display.o
                $(LINK) $(NETPBM) -lpub -lm
@@ -53,16 +59,32 @@ compose-segenco: compose-segenco.o
                neato -Tps <$< $o
 
 %.raw.neato:   %.redactgraph
-               ./$< printforneato $o
+               ./$< consistency printforneato $o
+
+%.redacted.neato: %.redactgraph
+               ./$< $(REDACT) consistency printforneato $o
+
+%.redacted.forsafety: %.redactgraph
+               ./$< $(REDACT) consistency printforforsafety $o
+
+%.layout-data.c: data2safety %.wiring %.redacted.forsafety \
+                       reversers.pin-info detectors.pin-info
+               ./$(filter-out %.pin-info, $^) $o
+
+%+pindata.asm: %.layout-data.c
+               @:
+
+%.pin-info:    pin-info-gen ../pcb/%.net
+               ./$< $* $o
 
 %.redactgraph: %.graph.o redactgraph.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
@@ -95,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
@@ -119,11 +145,20 @@ subseg2display.o compose-segenco.o: segcmap.h
 
 clean:
                -rm -f -- *.d4 *~ t.* *.m *.new core
-               -rm -f ours-*.ps parts.ps
+               -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
                -rm -f *.segcmap *.segcmapreq
                -rm -f *.dgram-*.p*.segenco.ps *.dgram-*.p*.segenco.ppm
-               -rm -f $(CPROGS) *.o
+               -rm -f *.dgram-*.plandata.c ours.graph.c ours.layout-data.c
+               -rm -f $(CPROGS) *.o *.d ours.redactgraph
+               -rm -f tmp.* ui-plan-*.ppm
 
 .PRECIOUS:     $(OPRINTS)
-.PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4 %.neato
+.PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4 %.neato %.raw.neato
+.PRECIOUS:     %.redactgraph %.redacted.forsafety %.redacted.neato
+.PRECIOUS:     %.layout-data.c %.pin-info
+
+include $(wildcard *.d)