X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pcb.mk;h=4386ec5ba07a9505870a6c10283a5a11ff003282;hb=a20af67fcc34dfb5fdbf7b5a0ebc03a51ca4dbbe;hp=8766d12323cb06c1b77d547a9a58c70d41e1af9c;hpb=1a3e76303a2c0342ca4fb781563c8fb89499c4b4;p=hw%2Faltusmetrum

diff --git a/pcb.mk b/pcb.mk
index 8766d12..4386ec5 100644
--- a/pcb.mk
+++ b/pcb.mk
@@ -22,6 +22,8 @@ drc:	$(PROJECT).drc
 $(PROJECT).drc: $(PROJECT).sch Makefile $(CONFIG)
 	-gnetlist -g drc2 $(PROJECT).sch -o $@
 
+partslists: partslist partslist.csv partslist.dk partslist-check.dk partslist-mouser.csv partslist.other
+
 partslist:	$(PROJECT).sch Makefile $(AM)/preferred-parts $(CONFIG)
 	gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
 	head -n1 $(PROJECT).unsorted > partslist
@@ -30,7 +32,7 @@ partslist:	$(PROJECT).sch Makefile $(AM)/preferred-parts $(CONFIG)
 
 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 ) > $@ && rm -f $(PROJECT).csvtmp
+	(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
 	$(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
@@ -68,14 +70,58 @@ $(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
+
 zip: $(PROJECT).zip
 
 $(PROJECT).zip: $(PROJECT).bottom.gbr $(PROJECT).xy Makefile
 	zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
 
+ac: $(PROJECT)-ac.zip $(PROJECT)-bom.csv
+
+$(PROJECT)-bom.csv: partslist.csv
+	cp partslist.csv $@
+
+$(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr
+	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
+	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
+	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
+		cp $(PROJECT).bottomsilk.gbr $(PROJECT).gbo; \
+	fi
+	if [ -f $(PROJECT).bottompaste.gbr ]; then \
+		cp $(PROJECT).bottompaste.gbr $(PROJECT).gbp; \
+	fi
+	if [ -f $(PROJECT).topsilk.gbr ]; then \
+		cp $(PROJECT).topsilk.gbr $(PROJECT).gto; \
+	fi
+	if [ -f $(PROJECT).toppaste.gbr ]; then \
+		cp $(PROJECT).toppaste.gbr $(PROJECT).gtp; \
+	fi
+	cp $(PROJECT).outline.gbr $(PROJECT).gml
+	cp $(PROJECT).top.gbr $(PROJECT).gtl
+	cp $(PROJECT).topmask.gbr $(PROJECT).gts
+	cp $(PROJECT).plated-drill.cnc $(PROJECT).ncd
+	if [ -f $(PROJECT).unplated-drill.cnc ]; then \
+		cp $(PROJECT).unplated-drill.cnc $(PROJECT).drd; \
+	fi
+	if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \
+		cp $(PROJECT).group1.gbr $(PROJECT).gl2; \
+		cp $(PROJECT).group2.gbr $(PROJECT).gl3; \
+	elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \
+		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
+		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
+	fi
+	zip $@ \
+		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
+		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
+		$(PROJECT).gml $(PROJECT).ncd $(PROJECT).gml $(PROJECT).drd \
+		$(PROJECT).gl2 $(PROJECT).gl3 \
+		$(PROJECT).xy
+
 oshpark: $(PROJECT)-oshpark.zip
 
-$(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr
+$(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc 
 	cp $(PROJECT).bottom.gbr bottom\ layer.ger
 	cp $(PROJECT).bottommask.gbr bottom\ solder\ mask.ger
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -87,7 +133,7 @@ $(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr
 	cp $(PROJECT).outline.gbr board\ outline.ger
 	cp $(PROJECT).top.gbr top\ layer.ger
 	cp $(PROJECT).topmask.gbr top\ solder\ mask.ger
-	cp $(PROJECT).plated-drill.cnc drills.xln
+	cp $(PROJECT).all-drill.cnc drills.xln
 	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; \
@@ -99,19 +145,25 @@ $(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr
 
 seeed: $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 
-$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr
+$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
 		cp $(PROJECT).bottomsilk.gbr $(PROJECT).gbo; \
 	fi
+	if [ -f $(PROJECT).bottompaste.gbr ]; then \
+		cp $(PROJECT).bottompaste.gbr $(PROJECT).gbp; \
+	fi
 	if [ -f $(PROJECT).topsilk.gbr ]; then \
 		cp $(PROJECT).topsilk.gbr $(PROJECT).gto; \
 	fi
+	if [ -f $(PROJECT).toppaste.gbr ]; then \
+		cp $(PROJECT).toppaste.gbr $(PROJECT).gtp; \
+	fi
 	cp $(PROJECT).outline.gbr $(PROJECT).gml
 	cp $(PROJECT).top.gbr $(PROJECT).gtl
 	cp $(PROJECT).topmask.gbr $(PROJECT).gts
-	cp $(PROJECT).plated-drill.cnc $(PROJECT).txt
+	cp $(PROJECT).all-drill.cnc $(PROJECT).txt
 	if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \
 		cp $(PROJECT).group1.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group2.gbr $(PROJECT).gl3; \
@@ -119,9 +171,12 @@ $(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $(PROJECT)-seeed.zip $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo \
-		$(PROJECT).gto $(PROJECT).gml $(PROJECT).gtl $(PROJECT).txt \
-		$(PROJECT).gl2 $(PROJECT).gl3
+	zip $(PROJECT)-seeed.zip \
+		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
+		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
+		$(PROJECT).gml $(PROJECT).txt \
+		$(PROJECT).gl2 $(PROJECT).gl3 \
+		$(PROJECT).xy $(PROJECT)-sch.pdf
 
 stencil:	$(PROJECT).bottom.gbr $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
 	zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
@@ -130,16 +185,21 @@ 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
+	rm -f partslist-check.dk partslist.dk partslist-mouser.csv partslist.other
 	rm -f $(PROJECT)-sch.ps $(PROJECT)-sch.pdf $(PROJECT)-pcb.ps $(PROJECT)-pcb.pdf
-	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gto $(PROJECT).gml
-	rm -f $(PROJECT).gtl $(PROJECT).gts $(PROJECT).txt $(PROJECT).gl2 $(PROJECT).gl3
+	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp
+	rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts
+	rm -f $(PROJECT).txt $(PROJECT).gl2 $(PROJECT).gl3
 	rm -f $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 	rm -f $(PROJECT)*.ps $(PROJECT)*.pdf
 
-muffins: partslist.csv $(AM)/glabels/muffin-short-5267.glabels
-	glabels-3-batch $(AM)/glabels/muffin-short-5267.glabels \
-		-i partslist.csv -o muffin-5267.ps >/dev/null && \
-		ps2pdf muffin-5267.ps && rm muffin-5267.ps
+muffins: muffin-5267.pdf muffin-keithp.pdf
+
+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
+
+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
@@ -180,3 +240,6 @@ gafrc:
 	(echo '; empty the library path and populate it with only our own symbols'; \
 	 echo '(reset-component-library)'; \
 	 echo '(load "../altusmetrum/gafrc")') > $@
+
+.gitignore: $(AM)/gitignore.in
+	sed 's/@@PROJECT@@/$(PROJECT)/g' $(AM)/gitignore.in > .gitignore