Get pcb.mk working with lepton
authorKeith Packard <keithp@keithp.com>
Wed, 23 Sep 2020 18:28:57 +0000 (11:28 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 23 Sep 2020 18:33:05 +0000 (11:33 -0700)
Use bomAM for partslist.csv generation
use lepton-cli for generating pdf files

Signed-off-by: Keith Packard <keithp@keithp.com>
pcb.mk

diff --git a/pcb.mk b/pcb.mk
index bb06de89963f82a381d85873be2e9d5773f0d3ef..69941901e46742fcd9d162e7b135f8aec1381c1a 100644 (file)
--- a/pcb.mk
+++ b/pcb.mk
@@ -31,7 +31,7 @@ partslist:    $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        rm -f $(PROJECT).unsorted
 
 partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
-       gnetlist -L $(SCHEME) -g partslistgag -o $(PROJECT).csvtmp $(SCHEMATICS)
+       gnetlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
        (head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8 | awk -f $(AM)/bin/fillpartscsv | sort ) > $@ && rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv
@@ -258,17 +258,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
 
-SCHEMATICS_PS=$(SCHEMATICS:.sch=.ps)
 SCHEMATICS_PDF=$(SCHEMATICS:.sch=.pdf)
 
-$(PROJECT)-sch.pdf:    $(SCHEMATICS_PDF)
-       pdfjoin -o $@ $(SCHEMATICS_PDF)
+$(PROJECT)-sch.pdf:    $(SCHEMATICS)
+       lepton-cli export -o $@ $*.sch
 
 $(PROJECT)-pcb.ps:     $(PROJECT).pcb $(CONFIG)
        pcb -x ps --psfile $@ --media Letter --ps-color $(PROJECT).pcb