From b6f9009a57d55343c2a0a3a6884cb7f4304308ac Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 20 Oct 2017 20:11:55 +0100
Subject: [PATCH] poster-tube-lid-parametric: incorporate, fix Makefiles, etc.

---
 Makefile                                                      | 3 ++-
 ...be-lid-parametric.pl => poster-tube-lid-parametric.scad.pl | 4 ++--
 poster-tube-lid.scad                                          | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename poster-tube-lid-parametric.pl => poster-tube-lid-parametric.scad.pl (97%)

diff --git a/Makefile b/Makefile
index 7ec60a7..16ee6c8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone an
 
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
-AUTO_INCS += funcs.scad sealing-box.scad sewing-table.scad
+AUTO_INCS += funcs.scad sealing-box.scad sewing-table.scad \
+	     poster-tube-lid-parametric.scad
 
 default:	autoincs scads
 
diff --git a/poster-tube-lid-parametric.pl b/poster-tube-lid-parametric.scad.pl
similarity index 97%
rename from poster-tube-lid-parametric.pl
rename to poster-tube-lid-parametric.scad.pl
index fc10667..353c712 100755
--- a/poster-tube-lid-parametric.pl
+++ b/poster-tube-lid-parametric.scad.pl
@@ -197,11 +197,11 @@ sub pv ($) {
 }
 
 sub write_out () {
-    print "polyhedron(points=[\n" or die $!;
+    print "module ImplHeadCup(){ polyhedron(points=[\n" or die $!;
     print pv($_),",\n" or die $! foreach @points;
     print "],faces=[\n" or die $!;
     print pv($_),",\n" or die $! foreach @triangles;
-    print "],convexity=10);\n" or die $!;
+    print "],convexity=10); }\n" or die $!;
 }
 
 make_sheet();
diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 6787416..c3a3a05 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -128,6 +128,8 @@ smc_cnr_c_x = sm_bolt_shaft/2 - sm_closure_cnr
 $fs= coarse ? 2.5 : 0.5;
 $fa= coarse ? 5 : 1;
 
+include <poster-tube-lid-parametric.scad>
+
 // bayonet definition
 
 bayo_a = [ bayo_entry_x, 0 ];
-- 
2.30.2