pandemic-counter: fix dependency

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index 1ae233f50ebdee944c2704e7f25ac3a020a16c52..1cabe5bb261f4948a000bd787f8fe8a942be0455 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ PLAY ?= $(CWD)
 
 CONFIG=$(PLAY)/slic3r-config.ini
 
-USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock
+USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
 AUTO_INCS = funcs.scad
@@ -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 $@
 
@@ -72,6 +76,12 @@ knifeblock-knives-t%.dxf: knifeblock-knives-filter knifeblock-knives-trace.fig
                fig2dev -D -30 -L eps <$@.tmp.fig >$@.tmp.eps
                pstoedit -dt -f "dxf: -polyaslines -mm" $@.tmp.eps $@
 
+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-l%.eps: pandemic-counter-letters.fig
                fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
                @mv -f $@.tmp $@
@@ -87,7 +97,7 @@ pandemic-counter-l%.eps: pandemic-counter-letters.fig
                $< $@ >$@.tmp
                @mv -f $@.tmp $@
 
-.PRECIOUS:     %.stl %.gcode
+.PRECIOUS:     %.stl %.gcode %.eps %.dxf
 
 clean:
                rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)