X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=b896f99e5cda25feb7b4737328897d0ca1b6e02e;hb=fa96b008ed17c7ff19cae7b4d5649f68b065a320;hp=2f3975967f77f3381f565a0d3a01db2c35017b1c;hpb=56b06fdd87ea604050e41adc3f12a22c74703bf4;p=hw%2Feasymini

diff --git a/Makefile b/Makefile
index 2f39759..b896f99 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ NICKLE=$(AM)/nickle
 RETAB=nickle $(NICKLE)/retab
 
 # intentionally want to rebuild drc and bom on every invocation
-all:	drc pcb partslist partslist.csv partslist.dk muffin-5267.pdf zip
+all:	drc pcb partslist $(PROJECT)-bom.csv partslist.dk muffin-5267.pdf zip
 
 drc: $(PROJECT).sch
 	gnetlist -L $(SCHEME) -g drc2 $(PROJECT).sch -o $(PROJECT).drc
@@ -14,8 +14,8 @@ partslist: $(PROJECT).sch
 	gnetlist -L $(SCHEME) -g bom -o $(PROJECT).tabtmp $(PROJECT).sch
 	(head -n1 $(PROJECT).tabtmp; tail -n+2 $(PROJECT).tabtmp | sort) | $(RETAB) > $@ && rm -f $(PROJECT).tabtmp
 
-partslist.csv: $(PROJECT).sch Makefile
-	gnetlist -L $(SCHEME) -g partslistgag -o $(PROJECT).csvtmp $(PROJECT).sch
+$(PROJECT)-bom.csv: $(PROJECT).sch Makefile
+	gnetlist -L $(SCHEME) -g partslistam -o $(PROJECT).csvtmp $(PROJECT).sch
 	(head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8) > $@ && rm -f $(PROJECT).csvtmp
 
 partslist.dk: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-bom.scm
@@ -24,8 +24,8 @@ partslist.dk: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-bom.scm
 partslist.mouser: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-bom.scm
 	gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=mouser -o $@ $(PROJECT).sch
 
-muffin-5267.pdf: partslist.csv $(AM)/glabels/muffin-5267.glabels
-	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i partslist.csv -o muffin-5267.ps && ps2pdf muffin-5267.ps && rm muffin-5267.ps
+muffin-5267.pdf: $(PROJECT)-bom.csv $(AM)/glabels/muffin-5267.glabels
+	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i $(PROJECT)-bom.csv -o muffin-5267.ps && ps2pdf muffin-5267.ps && rm muffin-5267.ps
 
 pcb:	$(PROJECT).sch project Makefile
 	gsch2pcb project
@@ -55,7 +55,7 @@ $(PROJECT)-oshpark.zip: $(PROJECT).gerb
 	cp easymini.outline.gbr board\ outline.ger
 	cp easymini.top.gbr top\ layer.ger
 	cp easymini.topmask.gbr top\ solder\ mask.ger
-	cp easymini.topsilk.gbr top\ silk\ screen.ger
+#	cp easymini.topsilk.gbr top\ silk\ screen.ger
 	cp easymini.plated-drill.cnc drills.xln
 	zip easymini-oshpark.zip *.ger *.xln
 
@@ -76,6 +76,6 @@ pdf:	$(PROJECT)-sch.pdf $(PROJECT)-pcb.pdf
 
 clean:
 	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr $(PROJECT).gerb *.cnc *bak* *- *.zip 
-	rm -f *.net *.xy *.cmd *.png partslist partslist.csv partslist.dk partslist.mouser muffin-5267.pdf
+	rm -f *.net *.xy *.cmd *.png partslist $(PROJECT)-bom.csv partslist.dk partslist.mouser muffin-5267.pdf
 	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls
 	rm -f $(PROJECT)-stencil.zip $(PROJECT)*.pdf $(PROJECT)*.ps