chiark / gitweb /
pandemic-counter: fix dependency
[reprap-play.git] / Makefile
index 0e94734ae58dd9c9b72e53a74746eedd5188f38c..1cabe5bb261f4948a000bd787f8fe8a942be0455 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 $@
 
@@ -76,7 +80,7 @@ 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)
 
 pandemic-counter-l%.eps: pandemic-counter-letters.fig
                fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp