X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=3d1b5a512e0e96ae3a055ef3ffc0a468ec3f5ccc;hp=00ced6916ac6e0d8b97f3a18ef5583218668d619;hb=c43059e99738d3f8cd051d7073d7059a3915c0e8;hpb=e0dae86d3a70d391615ecdbb7bacffee1c75b29d

diff --git a/Makefile b/Makefile
index 00ced69..3d1b5a5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,16 @@ 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 xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount
+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))
 
@@ -19,11 +24,9 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 %.auto.stls:
 	$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
 
-default:
-
 -include .*.d
 
-%.stl:		%.scad
+%.stl:		%.scad $(AUTO_INCS)
 		openscad -d .$@.d.tmp -o $*.tmp.stl $<
 		@rm -f $@
 		@sed -e 's/\.tmp\.stl:/.stl:/' <.$@.d.tmp >.$@.d
@@ -36,13 +39,16 @@ default:
 			--output $@.tmp $<
 	        @mv -f $@.tmp $@
 
+%:		%.cpp
+		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
+
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<
 
 %.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 $@'
@@ -52,4 +58,4 @@ dovecliptest.stl: doveclip.scad
 .PRECIOUS:	%.stl %.gcode
 
 clean:
-		rm -f *~ *.stl *.auto.scad *.gcode .*.d
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)