segment labelling work-in-progress - yet to do are labels and graph colouring

[trains.git] / layout / Makefile

diff --git a/layout/Makefile b/layout/Makefile
index 3a317c3fa33760f5d14ee07c108547ef3157daaf..e4d19afa81f34d3c61e437a2cec97121fabef5a1 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -73,6 +73,9 @@ compose-segenco: compose-segenco.o
 %.redacted.forsafety: %.redactgraph
                ./$< $(REDACT) consistency printforforsafety $o
 
+%.redacted.segjoins: %.redactgraph
+               ./$< $(REDACT) consistency printforlayoutsegjoins $o
+
 %.layout-data.c: data2safety %.wiring %.redacted.forsafety \
                        reversers.pin-info detectors.pin-info
                ./$(filter-out %.pin-info, $^) $o
@@ -123,6 +126,10 @@ ours.graph.c:      extractgraph ours.dgram-bot.p0.segenco.ps
 ours-l%.ps:    ours.d4 layout
                ./layout <$< -l$* $(LAYOUTOPTS) $(XLAYOUTOPTS_LAYER) $o
 
+ours-s%.ps:    layout ours.redacted.segjoins ours.d4
+               ./layout -l$* -e'*=*rldm' -E'=5Q' -e'segjoin=5M' \
+                       $(filter-out layout, $^) $o
+
 ours-m%.ps:    ours.d4 layout
                ./layout <$< -l$* -E'=*aRsclDmno' \
                        -E'=5RNLDA' -E'*~=5rCdsml' $(LAYOUTOPTS_PS) $o
@@ -164,12 +171,12 @@ clean:
                -rm -f *.segcmap *.segcmapreq
                -rm -f *.dgram-*.p*.segenco.ps *.dgram-*.p*.segenco.ppm
                -rm -f *.dgram-*.plandata.c ours.graph.c ours.layout-data.c
-               -rm -f $(CPROGS) *.o *.d ours.redactgraph
+               -rm -f $(CPROGS) *.o *.d ours.redactgraph *.segjoins
                -rm -f tmp.* ui-plan-*.ppm
 
 .PRECIOUS:     $(OPRINTS)
 .PRECIOUS:     %.segcmap %.segcmapreq %.segenco.ppm %.d4 %.neato %.raw.neato
 .PRECIOUS:     %.redactgraph %.redacted.forsafety %.redacted.neato
-.PRECIOUS:     %.layout-data.c %.pin-info
+.PRECIOUS:     %.layout-data.c %.pin-info %.segjoins
 
 include $(wildcard *.d)