X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb.mk;h=6e82af180ec65174d594086c391d5f3e12112964;hb=ff80e6ba7f6d7a972487602f1b3aa9b4977c971f;hp=9e44810afa99fdc140618ca9a74551aea7f04344;hpb=e5747a1d6d5f0db9322c1b2c5b46e0bb47e48336;p=hw%2Faltusmetrum

diff --git a/pcb.mk b/pcb.mk
index 9e44810..6e82af1 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 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)
@@ -34,7 +34,7 @@ partslist.csv:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	gnetlist -L $(SCHEME) -g partslistgag -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: partslist.csv
+partslist-dk.csv: partslist.csv
 	$(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
 
 partslist-check.dk: 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
@@ -232,7 +232,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 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 +241,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