air-hockey-puck: wip

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index de025b6e63679a0c5bb75931b5b69ce4a4728e67..f2302b677e7a7a8417511901ba869f8ef7112d61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # reprap-objects Makefile
 #
 # Build scripts for various 3D designs
-# Copyright 2012-2016 Ian Jackson
+# Copyright 2012-2023 Ian Jackson
 #
 # This work is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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 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-straphook powerbank-bike-clamp lipo-flat-mount $(foreach x,500 1000,adafruit-powerboost-$x)
+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 digispark-with-cable chimney-cable-retainer $(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)
 
@@ -57,12 +61,12 @@ pandemic-counter%.stl: $(PANDEMICCOUNTER_DXFS)
 .PRECIOUS: pandemic-counter-l%.eps
 pandemic-counter-l%.eps: pandemic-counter-letters.fig
                fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
-               @mv -f $@.tmp $@
+               @$i
 
 .PRECIOUS: maglite-holder-torch-curve.eps
 maglite-holder-torch-curve.eps: maglite-holder-torch.fig
                fig2dev -D +1:70 -L eps <$< >$@.tmp
-               @mv -f $@.tmp $@
+               @$i
 
 maglite-holder-torch-curve.dxf: maglite-holder-torch-curve.eps
                pstoedit -dt -flat 0.05 -f "dxf: -polyaslines -mm" $< $@
@@ -80,17 +84,17 @@ pandemic-quarantine%.stl: $(PANDEMICQUARANTINES_DXFS)
 .PRECIOUS: pandemic-quarantine-l%.eps
 pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
                fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
-               @mv -f $@.tmp $@
+               @$i
 
 FILAMENTSPOOL_NUMBERS=$(shell seq 300 100 1500)
 filamentspool-number-n%.eps:   filamentspool-number.eps.pl
-       ./$< $* >$@.tmp && mv -f $@.tmp $@
+       ./$< $* $o
 
 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)
 
@@ -99,17 +103,17 @@ SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
        screw-recess-test-number-s$s.dxf)
 
 screw-recess-test-number-s%.fig: screw-recess-test-number.fig.pl
-       ./$< $* >$@.tmp && mv -f $@.tmp $@
+       ./$< $* $o
 
 screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
                fig2dev -L eps <$< >$@.tmp
-               @mv -f $@.tmp $@
+               @$i
 
 screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
 
 question-question.eps: question-question.fig
                fig2dev -L eps <$< >$@.tmp
-               @mv -f $@.tmp $@
+               @$i
 
 sewing-table%.stl: sewing-table-rear-profile.dxf
 sewing-table%.stl: sewing-table-front-profile.dxf
@@ -117,7 +121,7 @@ sewing-table%.stl: sewing-table-end-profile.dxf
 
 sewing-table-%-profile.eps: sewing-table-%-profile.fig
                fig2dev -L eps -D +40 <$< >$@.tmp
-               @mv -f $@.tmp $@
+               @$i
 
 question-token.stl: question-question.dxf
 
@@ -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
+       $i