X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb.mk;h=ffe0fb45769a1a483a5eeb12fad9fb6e032ab788;hb=86ab56fea650108ca8ef638a91cd27722a80e3db;hp=f618e5f139e363e639fbcb7bca5204e75eecb451;hpb=5d6d381c8b118d1cdfa3d450dcdb27738f990e67;p=hw%2Faltusmetrum

diff --git a/pcb.mk b/pcb.mk
index f618e5f..ffe0fb4 100644
--- a/pcb.mk
+++ b/pcb.mk
@@ -22,7 +22,7 @@ drc:	$(PROJECT).drc
 $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
 	-gnetlist -g drc2 $(SCHEMATICS) -o $@
 
-partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist.other
+partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist-other.csv
 
 partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
@@ -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
@@ -43,7 +43,7 @@ partslist-check.dk: partslist.csv
 partslist-mouser.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor mouser partslist.csv > $@
 
-partslist.other: partslist.csv
+partslist-other.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --not-vendor digikey,mouser partslist.csv > $@
 
 $(PROJECT)-seeed.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; \
@@ -232,7 +238,7 @@ clean:
 	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr *.cnc *bak* *- *.zip 
 	rm -f *.net *.xy *.cmd *.png partslist partslist.csv *.ger *.xln
 	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls muffin-5267.pdf muffin-keithp.pdf
-	rm -f partslist-check.dk partslist-dk.csv partslist-mouser.csv partslist.other
+	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
 	rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts
@@ -241,7 +247,10 @@ clean:
 	rm -f $(PROJECT)-goldphoenix.zip $(PROJECT)-goldphoenix.csv
 	rm -f $(PROJECT)*.ps $(PROJECT)*.pdf
 
-muffins: muffin-5267.pdf muffin-keithp.pdf
+muffins: muffin-6570.pdf muffin-5267.pdf muffin-keithp.pdf
+
+muffin-6570.pdf: partslist.csv $(AM)/glabels/muffin-6570.glabels
+	glabels-3-batch $(AM)/glabels/muffin-6570.glabels -i partslist.csv -o $@ > /dev/null
 
 muffin-5267.pdf: partslist.csv $(AM)/glabels/muffin-short-5267.glabels
 	glabels-3-batch $(AM)/glabels/muffin-short-5267.glabels -i partslist.csv -o $@ > /dev/null
@@ -249,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