X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb.mk;h=ffe0fb45769a1a483a5eeb12fad9fb6e032ab788;hb=8cf4ac67066895ebbb08589e878f1c528f7f74a1;hp=6e82af180ec65174d594086c391d5f3e12112964;hpb=db0d9fcfeb5caf20713662ee8b3417147706c6b4;p=hw%2Faltusmetrum

diff --git a/pcb.mk b/pcb.mk
index 6e82af1..ffe0fb4 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
@@ -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
 
@@ -140,6 +140,12 @@ $(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc
 	cp $(PROJECT).top.gbr top\ layer.ger
 	cp $(PROJECT).topmask.gbr top\ solder\ mask.ger
 	cp $(PROJECT).all-drill.cnc drills.xln
+	if [ -f $(PROJECT).toppaste.gbr ]; then \
+		cp $(PROJECT).toppaste.gbr top\ paste.ger; \
+	fi
+	if [ -f $(PROJECT).bottompaste.gbr ]; then \
+		cp $(PROJECT).bottompaste.gbr bottom\ paste.ger; \
+	fi
 	if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \
 		cp $(PROJECT).group1.gbr internal\ plane\ 1.ger; \
 		cp $(PROJECT).group2.gbr internal\ plane\ 2.ger; \
@@ -252,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