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

diff --git a/pcb.mk b/pcb.mk
index 8e927a2..ffe0fb4 100644
--- a/pcb.mk
+++ b/pcb.mk
@@ -22,19 +22,19 @@ 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:	$(PROJECT).sch Makefile $(AM)/preferred-parts $(CONFIG)
+partslist:	$(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
 	gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
 	head -n1 $(PROJECT).unsorted > partslist
 	tail -n+2 $(PROJECT).unsorted | sort | awk -f $(AM)/bin/fillpartslist >> partslist
 	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: 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
@@ -74,19 +74,19 @@ $(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
 
 $(PROJECT).zip: $(PROJECT).bottom.gbr $(PROJECT).xy Makefile
-	zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
+	rm -f $@ && 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
+$(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr $(PROJECT).xy
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -108,6 +108,9 @@ $(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr
 	if [ -f $(PROJECT).unplated-drill.cnc ]; then \
 		cp $(PROJECT).unplated-drill.cnc $(PROJECT).drd; \
 	fi
+	if [ -f $(PROJECT).fab.gbr ]; then \
+		cp $(PROJECT).fab.gbr $(PROJECT).fab; \
+	fi
 	if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \
 		cp $(PROJECT).group1.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group2.gbr $(PROJECT).gl3; \
@@ -115,12 +118,12 @@ $(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $@ \
+	rm -f $@ && 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
+		$(PROJECT).xy $(PROJECT).fab
 
 oshpark: $(PROJECT)-oshpark.zip
 
@@ -137,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; \
@@ -144,11 +153,11 @@ $(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc
 		cp $(PROJECT).group2.gbr internal\ plane\ 1.ger; \
 		cp $(PROJECT).group3.gbr internal\ plane\ 2.ger; \
 	fi
-	zip $(PROJECT)-oshpark.zip *.ger *.xln
+	rm -f $@ && zip $@ *.ger *.xln
 
 seeed: $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 
-$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(SEEED_EXTRA)
+$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(PROJECT).xy $(SEEED_EXTRA)
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -174,7 +183,7 @@ $(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $(PROJECT)-seeed.zip \
+	rm -f $@ && zip $@ \
 		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
 		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
 		$(PROJECT).gml $(PROJECT).txt \
@@ -184,7 +193,7 @@ $(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-
 
 goldphoenix: $(PROJECT)-goldphoenix.zip
 
-$(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf  $(PROJECT)-goldphoenix.csv
+$(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(PROJECT).xy $(PROJECT)-goldphoenix.csv
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -210,7 +219,7 @@ $(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PRO
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $(PROJECT)-goldphoenix.zip \
+	rm -f $@ && zip $@ \
 		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
 		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
 		$(PROJECT).gml $(PROJECT).txt \
@@ -219,7 +228,7 @@ $(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PRO
 		$(PROJECT)-goldphoenix.csv
 
 stencilsunlimited:	$(PROJECT).bottom.gbr $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
-	zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
+	rm -f $(PROJECT)-stencil.zip && zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
 
 stencil:	$(PROJECT).pcb
 	pcb -x gerber --paste-adjust -0.075 $(PROJECT).pcb
@@ -228,17 +237,20 @@ stencil:	$(PROJECT).pcb
 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 *.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.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
+	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp $(PROJECT).ncd
 	rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts
-	rm -f $(PROJECT).txt $(PROJECT).gl2 $(PROJECT).gl3
+	rm -f $(PROJECT).txt $(PROJECT).gl2 $(PROJECT).gl3 $(PROJECT).fab
 	rm -f $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 	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
@@ -246,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