screw-recess-test: break out OneTestCore (nfc)

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index 2c8684410814a3ebcd8e0d3bd6b770f406657a68..937bcc9dc95ceeea0c2cb096f35c5e99c1af6afb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,13 @@ stls:                $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
                @rm .$@.d.tmp
                mv -f $*.tmp.stl $@
 
+AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
+
 %.gcode:       %.stl $(CONFIG)
                $(SLIC3R) --load $(CONFIG) \
-                       --ignore-nonexistent-config --load $*.slic3r \
+                       --ignore-nonexistent-config \
+                       --load $(call AUTOBASE,$*).slic3r \
+                       --load $*.slic3r \
                        --output $@.tmp $<
                @mv -f $@.tmp $@
 
@@ -67,6 +71,7 @@ KNIFEBLOCK_TEMPLATE_FILES=\
 
 knifeblock-knives-templates knifeblock.stl: $(KNIFEBLOCK_TEMPLATE_FILES)
 
+.PRECIOUS: knifeblock-knives-t%.dxf
 knifeblock-knives-t%.dxf: knifeblock-knives-filter knifeblock-knives-trace.fig
                ./$< $(notdir $*) <$(filter %.fig, $^) >$@.tmp.fig
                fig2dev -D -30 -L eps <$@.tmp.fig >$@.tmp.eps
@@ -76,8 +81,9 @@ PANDEMICCOUNTER_LETTERS=30 31 32 33 34 35
 PANDEMICCOUNTER_DXFS=$(foreach l,$(PANDEMICCOUNTER_LETTERS), \
        pandemic-counter-l$l.dxf)
 
-pandemic-counter-letters pandemic-counter.stl: $(PANDEMICCOUNTER_DXFS)
+pandemic-counter-letters pandemic-counter%.stl: $(PANDEMICCOUNTER_DXFS)
 
+.PRECIOUS: pandemic-counter-l%.eps
 pandemic-counter-l%.eps: pandemic-counter-letters.fig
                fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
                @mv -f $@.tmp $@
@@ -88,12 +94,13 @@ pandemic-counter-l%.eps: pandemic-counter-letters.fig
 %:             %.pl
                ./$< >$@.tmp && mv -f $@.tmp $@
 
+.PRECIOUS: %.auto.scad
 %.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
                @echo ' write $@'
                $< $@ >$@.tmp
                @mv -f $@.tmp $@
 
-.PRECIOUS:     %.stl %.gcode
+.PRECIOUS:     %.stl %.gcode %.eps %.dxf
 
 clean:
                rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)