X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=6a4b9c5f5dcb5a3ff022169e353903449b7ce604;hp=5fad8d0a136e6bbf4eee99c8133f0a659944175a;hb=e9fcf5fd1d3ff5d31afff25d68eec10501c9d168;hpb=4513d15d4bc1dcacd1babbdbdbd01669b4f022d8;ds=sidebyside

diff --git a/Makefile b/Makefile
index 5fad8d0..6a4b9c5 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,11 @@ 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
 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,30 +24,31 @@ 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
 		@rm .$@.d.tmp
 	        mv -f $*.tmp.stl $@
 
-%.gcode:	%.stl %.slic3r $(CONFIG)
+%.gcode:	%.stl $(CONFIG)
 		$(SLIC3R) --load $(CONFIG) \
 			--ignore-nonexistent-config --load $*.slic3r \
 			--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)