X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb.mk;h=f282013f655fd583afe17217c9bcb6c421ec8f84;hb=0d9cbb95bdf978348b6ca8501e1a012bdc3c2875;hp=840db2b67ceda38c205da581474e8ed24929c698;hpb=e79d79855df7f8fd464764e2aed0f0d78fbe3be9;p=hw%2Faltusmetrum

diff --git a/pcb.mk b/pcb.mk
index 840db2b..f282013 100644
--- 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
@@ -53,7 +53,7 @@ $(PROJECT)-goldphoenix.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor goldphoenix partslist.csv > $@
 
 pcb:	$(SCHEMATICS) Makefile $(CONFIG)
-	gsch2pcb project
+	lepton-sch2pcb project
 
 $(PROJECT).xy:	$(PROJECT).pcb $(CONFIG)
 	pcb -x bom $(PROJECT).pcb
@@ -74,7 +74,7 @@ $(PROJECT).bottom.gbr:	$(PROJECT).pcb $(CONFIG)
 	esac
 
 $(PROJECT).all-drill.cnc: $(PROJECT).bottom.gbr
-	gerbv -x drill -o $(PROJECT).all-drill.cnc $(PROJECT).plated-drill.cnc $(PROJECT).unplated-drill.cnc
+	gerbv -x drill -o $(PROJECT).all-drill.cnc $(PROJECT).*plated-drill.cnc
 
 zip: $(PROJECT).zip
 
@@ -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 $@ $(SCHEMATICS)
 
 $(PROJECT)-pcb.ps:	$(PROJECT).pcb $(CONFIG)
 	pcb -x ps --psfile $@ --media Letter --ps-color $(PROJECT).pcb