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 0066e8dfa44c4df98a68c851f473a70296986aa6..e4d19afa81f34d3c61e437a2cec97121fabef5a1 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -40,9 +40,13 @@ extras:              ours-a.ps ours-al.ps dualjn-a.ps parts.ps
 include ours.dgram.m
 include segencolayers.m
 
-NETPBM =       -lnetpbm
+#NETPBM =      -lnetpbm
 ifeq (,$(shell test -f /usr/lib/libppm.so || echo no))
 NETPBM +=      -lppm
+else
+ifeq (,$(shell test -f /usr/lib/libnetpbm.so || echo no))
+NETPBM +=      -lnetpbm
+endif
 endif
 
 REDACT=                consistency movfeatsplitedges   \
@@ -69,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
@@ -119,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
@@ -151,7 +162,7 @@ ui-plan-%.ppm:      ours.dgram-%.pa.segenco.ppm Makefile
 subseg2display.o compose-segenco.o: segcmap.h
 
 clean:
-               -rm -f -- *.d4 *~ t.* *.m *.new core
+               -rm -f -- *.d4 *~ t.* *.m *.new core *.d
                -rm -f ours.*.ps ours-*.ps parts.ps *.neato.ps ours.*.neato
                -rm -f dualjn-*.ps
                -rm -f *.pin-info *+pindata.asm
@@ -160,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)