X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=4afba5d42848dca8a22d88a433b96a4b8e94a3cd;hp=317fe3987b334c153c4819ce5356e7be6eb68439;hb=08d58c92fa517c6a62ed31af40182cc135c9c6db;hpb=949c67dd9deab6f8359127e646a8f038498ef2d1

diff --git a/Makefile b/Makefile
index 317fe39..4afba5d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,23 +6,47 @@ SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_applicatio
 CWD := $(shell pwd)
 PLAY ?= $(CWD)
 
-CONFIG=slic3r-config.ini
+CONFIG=$(PLAY)/slic3r-config.ini
 
-USING_AUTOS ?= filamentspool
+USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
+AUTO_INCS = funcs.scad
+
+default:	autoincs scads
+
+autoincs:	$(AUTO_INCS)
 scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
 stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
-default:
+%.auto.scads:
+	$(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
+%.auto.stls:
+	$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
 
 -include .*.d
 
-%.stl:		%.scad
-		openscad -d .$@.d -o $@ $<
+%.stl:		%.scad $(AUTO_INCS)
+		openscad -d .$@.d.tmp -o $*.tmp.stl $<
+		@rm -f $@
+		@sed -e 's/\.tmp\.stl:/.stl:/' <.$@.d.tmp >.$@.d
+		@rm .$@.d.tmp
+	        mv -f $*.tmp.stl $@
+
+%.gcode:	%.stl $(CONFIG)
+		$(SLIC3R) --load $(CONFIG) \
+			--ignore-nonexistent-config --load $*.slic3r \
+			--output $@.tmp $<
+	        @mv -f $@.tmp $@
+
+%.gcode-sd:	%.gcode
+		mount /media/sd
+		cp $^ /media/sd/JOB.G
+		sleep 0.5
+		umount /media/sd
 
-%.gcode:	$(CONFIG) %.stl
-		$(SLIC3R) --load $^ --output $@
+%:		%.cpp
+		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
 
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<
@@ -30,12 +54,14 @@ default:
 %.gcode:	manual-gcode-generator %.m-g
 		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
 
-dovecliptest.stl: doveclip.scad
+dovecliptest.stl: doveclip.scad $(AUTO_INCS)
 
 %.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
 		@echo ' write $@'
 		$< $@ >$@.tmp
 	        @mv -f $@.tmp $@
 
+.PRECIOUS:	%.stl %.gcode
+
 clean:
-		rm -f *~ *.stl *.auto.scad *.gcode .*.d
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)