X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=840b9a6270560ceb37b3d6826fbc7591b95b1dce;hp=628cbf1b5daf70fae90a1dfa614e652726c259a6;hb=d3b970ba05936a4d135dbf1b45a58faec1af7f83;hpb=b4c42c12319e5304d22ab18e0eef20fe1ec6c008

diff --git a/Makefile b/Makefile
index 628cbf1..840b9a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,20 @@
 
 HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
+SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
+
+CONFIG=slic3r-config.ini
 
 default:
 
 %.stl:		%.scad
 		openscad -o $@ $<
 
-%.gcode:	%.stl
-		$(SLIC3R) --load slic3r-config.ini $< --output $@
+%.gcode:	$(CONFIG) %.stl
+		$(SLIC3R) --load $^ --output $@
+
+#%.gcode:	%.stl
+#		$(SKEINFORGE) $<
 
+%.gcode:	manual-gcode-generator %.m-g
+		./$^ >$@.new && mv -f $@.new $@