Revert "wardrobe-hook: frontbackly version: wip assing()ish, before revert"

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index 2c677dc386c8b6ed1c2528ef20bc5b8a46da1b13..6a4b9c5f5dcb5a3ff022169e353903449b7ce604 100644 (file)
--- 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
+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,28 +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:       $(CONFIG) %.stl
-               $(SLIC3R) --load $^ --ignore-nonexistent-config --load $*.slic3r --output $@.tmp
+%.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 $@'
@@ -50,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)