X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=9e879aba64a359ed74896b1d24093095454f52a7;hp=8bf5fadf251bdb7bcdb9c5e099024045b20c00d1;hb=6736274070018db9e64ffb5f256ce11a6f12fa14;hpb=989d64e4afd73950f27b8218cfa9799d20cf4282

diff --git a/Makefile b/Makefile
index 8bf5fad..9e879ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,21 @@
+# reprap-objects Makefile
+#
+# Build scripts for various 3D designs
+# Copyright 2012-2016 Ian Jackson
+#
+# This work is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This work is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this work.  If not, see <http://www.gnu.org/licenses/>.
+
 
 HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
@@ -8,13 +26,15 @@ 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 pandemic-counter
+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 pattress-boxes-3-cover
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
 AUTO_INCS = funcs.scad
 
 default:	autoincs scads
 
+$(shell set -xe; ./commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad )
+
 autoincs:	$(AUTO_INCS)
 scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
 stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
@@ -81,13 +101,26 @@ 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: $(PANDEMICCOUNTER_DXFS)
+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 $@
 
+PANDEMICQUARANTINES_NUMBERS=1 2
+PANDEMICQUARANTINES_DXFS=$(foreach l,$(PANDEMICQUARANTINES_NUMBERS), \
+	pandemic-quarantine-l$l.dxf)
+
+pandemic-quarantine-numbers: $(PANDEMICQUARANTINES_DXFS)
+pandemic-quarantine%.stl: $(PANDEMICQUARANTINES_DXFS)
+
+.PRECIOUS: pandemic-quarantine-l%.eps
+pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
+		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
 SCREWRECESSTEST_SIZES= 2 3 4 5 6
 SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
 	screw-recess-test-number-s$s.dxf)
@@ -101,6 +134,14 @@ screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
 
 screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
 
+question-question.eps: question-question.fig
+		fig2dev -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+question-token.stl: question-question.dxf
+
+lemon-stand.stl: lemon-stand.scad
+
 .PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
 	$(foreach s,$(SCREWRECESSTEST_SIZES), \
 		screw-recess-test-number-s$s.fig \