X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=e2e7ea9d327b446232fcb0e6b645c9b6be00c144;hb=refs%2Fheads%2Fskinny;hp=43eb9c64c4bc36ab63c39dc856a91de7c07325cc;hpb=ea334d5bb93d4a54c8954855bf7226b4ee2acbbb;p=hw%2Ftelegps

diff --git a/Makefile b/Makefile
index 43eb9c6..e2e7ea9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,75 +1,65 @@
 PROJECT=telegps
 AM=../altusmetrum
 SCHEME=$(AM)/scheme
-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 partslist.mouser muffin-5267.pdf zip
+all:	drc partslist partslist.csv pcb
 
-drc: $(PROJECT).sch
-	gnetlist -L $(SCHEME) -g drc2 $(PROJECT).sch -o $(PROJECT).drc
+drc:	$(PROJECT).sch Makefile
+	-gnetlist -g drc2 $(PROJECT).sch -o $(PROJECT).drc
 
-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:	$(PROJECT).sch Makefile
+	gnetlist -g bom -o $(PROJECT).unsorted $(PROJECT).sch
+	head -n1 $(PROJECT).unsorted > partslist
+	tail -n+2 $(PROJECT).unsorted | sort >> partslist
+	rm -f $(PROJECT).unsorted
 
-partslist.csv: $(PROJECT).sch Makefile
+partslist.csv:	$(PROJECT).sch Makefile
 	gnetlist -L $(SCHEME) -g partslistgag -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
 	gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=digikey -o $@ $(PROJECT).sch
 
 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
-
-$(PROJECT).pcb: pcb
-
 pcb:	$(PROJECT).sch project Makefile
 	gsch2pcb project
 
-# note that 'gschlas -e foo.sch' will embed all symbols in the schematic, this
-# might be a really good idea for publishing designs to the web that others
-# might review?  Like this example from DJ:
-#
-#web :
-#        for i in channel.sch ethernet.sch power.sch mcu.sch; do \
-#          cp $$i tmp.sch ; \
-#          gschlas -e tmp.sch ; \
-#          mv tmp.sch ${WEB}/$$i; \
-#        done
-
-# this shoves local work out to the git.gag.com repository
-push:	
-	git push --mirror
-
 $(PROJECT).xy:	$(PROJECT).pcb
 	pcb -x bom $(PROJECT).pcb
 
-GERB_FILES=*.gbr *.ger *.cnc
-
-$(PROJECT).gerb: $(PROJECT).pcb
-	rm -f $(GERB_FILES)
+$(PROJECT).bottom.gbr:	$(PROJECT).pcb
 	pcb -x gerber $(PROJECT).pcb
-	mv $(PROJECT).group1.gbr "$(PROJECT).Internal Plane 1".ger
-	mv $(PROJECT).group2.gbr "$(PROJECT).Internal Plane 2".ger
-	touch $@
 
-zip: $(PROJECT).zip
-
-$(PROJECT).zip: $(PROJECT).gerb $(PROJECT).xy
-	rm -f $(PROJECT).zip
-	zip $(PROJECT).zip $(GERB_FILES)
-
-stencil:	$(PROJECT).gerb
+zip:	$(PROJECT).bottom.gbr $(PROJECT).bottommask.gbr $(PROJECT).fab.gbr $(PROJECT).top.gbr $(PROJECT).topmask.gbr $(PROJECT).toppaste.gbr $(PROJECT).topsilk.gbr $(PROJECT).group1.gbr $(PROJECT).group2.gbr $(PROJECT).plated-drill.cnc $(PROJECT).xy  Makefile # $(PROJECT).xls
+	zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
+
+oshpark: $(PROJECT).bottom.gbr $(PROJECT).bottommask.gbr $(PROJECT).top.gbr $(PROJECT).topmask.gbr $(PROJECT).topsilk.gbr $(PROJECT).plated-drill.cnc
+	mv $(PROJECT).bottom.gbr bottom\ layer.ger
+	mv $(PROJECT).bottommask.gbr bottom\ solder\ mask.ger
+	mv $(PROJECT).bottomsilk.gbr bottom\ silk\ screen.ger
+	mv $(PROJECT).outline.gbr board\ outline.ger
+	mv $(PROJECT).top.gbr top\ layer.ger
+	mv $(PROJECT).topmask.gbr top\ solder\ mask.ger
+	mv $(PROJECT).topsilk.gbr top\ silk\ screen.ger
+	mv $(PROJECT).plated-drill.cnc drills.xln
+	mv $(PROJECT).group1.gbr internal\ plane\ 1.ger
+	mv $(PROJECT).group2.gbr internal\ plane\ 2.ger
+	zip $(PROJECT)-oshpark.zip *.ger *.xln
+
+stencil:	$(PROJECT).bottom.gbr $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
 	zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
 
 clean:
-	rm -f *.bom *.drc *.log *~ $(PROJECT).ps $(GERB_FILES) $(PROJECT).gerb *bak* *- *.zip 
-	rm -f *.net *.cmd *.png partslist partslist.csv *.xy partslist.dk partslist.mouser muffin-5267.pdf
-	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls
-	rm -f $(PROJECT)-stencil.zip
+	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
+
+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
+