Remove some more obsolete Huxley stuff

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index 9b7b64cafb02323b29836a83a84cc2e4b706f0cf..b76ba162fd7eddc9122742fbaa8897205bed2636 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,13 @@ USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone an
 
 AUTO_INCS += sealing-box.scad sewing-table.scad nutbox.scad \
             powerbank-anker-10000.dxf \
-            poster-tube-lid-parametric.scad $(QUACKS_SCADS)
+            poster-tube-lid-parametric.scad \
+            $(QUACKS_SCADS)
 
-include reprap-objects.make
+AUTO_STLS_INCS += poster-tube-lid,CatchPostDistort-fa3.stl
+AUTO_STLS_INCS += poster-tube-lid,CatchPostDistort-fa20.stl
+
+include diziet-utils/reprap-objects.make
 
 dovecliptest.stl: doveclip.scad $(AUTO_INCS)
 
@@ -90,7 +94,7 @@ FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
        filamentspool-number-n$n.dxf)
 
 $(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
-       $(PLAY)/toplevel-find $(PLAY)/$f))): $(FILAMENTSPOOL_DXFS)
+       $(DUTILS)/toplevel-find $(CWD)/$f))): $(FILAMENTSPOOL_DXFS)
 
 filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
 
@@ -135,9 +139,12 @@ quacks-stls: $(addsuffix .auto.stls, $(QUACKSES))
                screw-recess-test-number-s$s.fig \
                screw-recess-test-number-s$s.eps)
 
+poster-tube-lid,CatchAssembly.auto.stl: poster-tube-lid,CatchPostDistort-fa3.stl
+poster-tube-lid-coarse,CatchAssembly.auto.stl: poster-tube-lid,CatchPostDistort-fa20.stl
+
 poster-tube-lid,CatchPostDistort-fa%.stl: \
-       distort-stl poster-tube-lid,CatchPreDistort.auto.stl
-               ./distort-stl <poster-tube-lid,CatchPreDistort.auto.stl \
-                       set-fa $(notdir $*) project-cylinder 100 >$@.tmp
-               mv -f $@.tmp $@
+               distort-stl poster-tube-lid,CatchPreDistort.auto.stl
+       ./distort-stl <poster-tube-lid,CatchPreDistort.auto.stl \
+               set-fa $(notdir $*) project-cylinder 100 >$@.tmp
+       mv -f $@.tmp $@