Remove some obsolete Huxley firmware files

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index 35bfad0770a02102f5b7bb729ed6c523552ec677..b76ba162fd7eddc9122742fbaa8897205bed2636 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,17 @@ FILAMENTSPOOL_AUTOS += filamentspool-storarm3
 QUACKSES = $(addprefix quacks-ingredients-L, 1 2 3 4 5)
 QUACKS_SCADS = $(addsuffix .scad, $(QUACKSES))
 
-USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount sewing-table sewing-table-test sewing-table-jig maglite-holder poster-tube-lid poster-tube-lid-coarse fairphone-case fairphone-battery-case lock-inframe-bracket ksafe-base $(QUACKSES) quacks-ingredients-demos mic-table-clamp nook-case nook-case-test scaffold-clamp-common.scad scaffold-clamp-tensioner scaffold-clamp-straphook powerbank-bike-clamp
+USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount sewing-table sewing-table-test sewing-table-jig maglite-holder poster-tube-lid poster-tube-lid-coarse fairphone-case fairphone-battery-case fairphone4-case fairphone4-case-coarse lock-inframe-bracket ksafe-base $(QUACKSES) quacks-ingredients-demos mic-table-clamp nook-case nook-case-test scaffold-clamp-common scaffold-clamp-tensioner scaffold-clamp-linear-bracket scaffold-clamp-straphook powerbank-bike-clamp topeak-mtx-tortec-expeditionrack-adapter lipo-flat-mount laptop-sound-cable-hooks $(foreach x,500 1000,adafruit-powerboost-$x)
 
 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 $@