Makefile: know how to cpp things

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index feb5c2876ea4697a8194869f9e65cb471600e797..a5e5278c54d9c6d643999ccf3ac443a5e1944f50 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,25 +6,38 @@ 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
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
 scads:         $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
 stls:          $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
+%.auto.scads:
+       $(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
+%.auto.stls:
+       $(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
+
 default:
 
 -include .*.d
 
 %.stl:         %.scad
-               openscad -d .$@.d -o $@.tmp $<
+               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:       $(CONFIG) %.stl
-               $(SLIC3R) --load $^ --output $@.tmp
-               @mv -f $@.tmp $@
+%:             %.cpp
+               cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
 
 #%.gcode:      %.stl
 #              $(SKEINFORGE) $<