X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb-rnd.mk;h=a574b804490a76f9d364db8f325f01ad09168326;hb=2368cabe4afc97b3cef7bb50d7aca3422e9fba25;hp=4405f67d92bc4408df4fc4a03a75ee03ab80f52b;hpb=2a99d9db90685382489982b94e542091186ec23e;p=hw%2Faltusmetrum

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index 4405f67..a574b80 100644
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -1,7 +1,7 @@
 AM=../altusmetrum
 SCHEME=$(AM)/scheme
 
-.SUFFIXES: .lht .sch .ps .pdf .tdx
+.SUFFIXES: .lht .sch .ps .pdf .tdx .scad .stl
 
 # need to have PROJECT defined
 ifndef PROJECT
@@ -99,13 +99,18 @@ stencilsunlimited:	$(BOTTOMCOPPER) $(PROJECT).toppaste.gbr $(OUTLINE)
 	rm -f $(PROJECT)-stencil.zip && zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(OUTLINE)
 
 stencil:	$(PROJECT).lht
-	pcb-rnd -x cam gerber:universal -c design/paste_adjust=-10mil $(PROJECT).lht
-	mv $(PROJECT).top.paste.none.0.gbr stencil.gbr
+	pcb-rnd -x cam gerber:stencils --outfile out/$(PROJECT) $(PROJECT).lht
+
+$(PROJECT).scad:	$(PROJECT).lht
+	pcb-rnd -x openscad $(PROJECT).lht
+
+$(PROJECT).stl:	$(PROJECT).scad
+	openscad --o $(PROJECT).stl $(PROJECT).scad
 
 clean:
 	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr *.cnc *bak* *- *.zip *.tdx *.backup
 	rm -f *.net *.xy *.cmd *.png partslist partslist.csv *.ger *.xln PCB*save
-	rm -f *.partslist *.unsorted $(PROJECT).xls muffin-*.pdf
+	rm -f *.partslist *.unsorted $(PROJECT).xls muffin-*.pdf attribs
 	rm -f partslist-check.dk partslist-dk.csv partslist-mouser.csv partslist-other.csv
 	rm -f $(PROJECT)-sch.ps $(PROJECT)-sch.pdf $(PROJECT)-pcb.ps $(PROJECT)-pcb.pdf
 	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp $(PROJECT).ncd
@@ -115,6 +120,7 @@ clean:
 	rm -f $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 	rm -f $(PROJECT)-goldphoenix.zip $(PROJECT)-goldphoenix.csv
 	rm -f $(PROJECT)*.ps $(PROJECT)*.pdf $(PROJECT)-bom.csv
+	rm -f *.scad
 	rm -fr out
 
 muffins: muffin-6570.pdf muffin-5267.pdf muffin-keithp.pdf
@@ -128,17 +134,13 @@ muffin-5267.pdf: partslist.csv $(AM)/glabels/muffin-short-5267.glabels
 muffin-keithp.pdf: partslist.csv $(AM)/glabels/muffin-5267.glabels
 	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i partslist.csv -o $@ > /dev/null
 
-.sch.ps:
-	gschem -p -o $@ -s /usr/share/gEDA/scheme/print.scm $*.sch
-
-.ps.pdf:
-	ps2pdf $*.ps
+.sch.pdf:
+	lepton-cli export -o $@ $*.sch
 
-SCHEMATICS_PS=$(SCHEMATICS:.sch=.ps)
 SCHEMATICS_PDF=$(SCHEMATICS:.sch=.pdf)
 
 $(PROJECT)-sch.pdf:	$(SCHEMATICS_PDF)
-	pdfjoin -o $@ $(SCHEMATICS_PDF)
+	pdfunite $(SCHEMATICS_PDF) $@
 
 $(PROJECT)-pcb.ps:	$(PROJECT).lht $(CONFIG)
 	pcb-rnd -x ps --psfile $@ --media Letter --ps-color $(PROJECT).lht
@@ -146,10 +148,10 @@ $(PROJECT)-pcb.ps:	$(PROJECT).lht $(CONFIG)
 $(PROJECT)-pcb.pdf:	$(PROJECT)-pcb.ps
 	ps2pdf $(PROJECT)-pcb.ps
 
-$(PROJECT)-big.ps:	$(PROJECT).lht $(CONFIG)
+$(PROJECT)-big.ps:     $(PROJECT).lht $(CONFIG)
 	pcb-rnd -x ps --psfile $@ --media Letter --ps-color --fill-page --no-align-marks $(PROJECT).lht
 
-$(PROJECT)-big.pdf:	$(PROJECT)-big.ps
+$(PROJECT)-big.pdf:    $(PROJECT)-big.ps
 	ps2pdf $(PROJECT)-big.ps
 
 pdf:	$(PROJECT)-sch.pdf $(PROJECT)-pcb.pdf $(PROJECT)-big.pdf