move to standardized makefile

diff --git a/Makefile b/Makefile
index 1473f4833479bf9c7bf31321a21fb7cd323364b0..24cb6f6595c721dd92255b1297ff44606fee3eea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,78 +1,79 @@
 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 >/dev/null && 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)-stencil.zip
+zip:   $(PROJECT).bottom.gbr $(PROJECT).bottommask.gbr $(PROJECT).fab.gbr $(PROJECT).top.gbr $(PROJECT).topmask.gbr $(PROJECT).toppaste.gbr $(PROJECT).topsilk.gbr $(PROJECT).group2.gbr $(PROJECT).group3.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).group2.gbr internal\ plane\ 1.ger
+       mv $(PROJECT).group3.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
 
-$(PROJECT).zip: $(PROJECT).gerb $(PROJECT).xy
-       rm -f $@
-       zip $(PROJECT).zip $(GERB_FILES)
+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
 
-$(PROJECT)-stencil.zip:        $(PROJECT).gerb
-       rm -f $@
-       zip $@ $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
+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
 
-stencil:       telegps.bottom.gbr telegps.toppaste.gbr telegps.outline.gbr
-       zip telegps-stencil.zip telegps.toppaste.gbr telegps.outline.gbr
+$(PROJECT)-sch.ps: $(PROJECT).sch
+       gschem -p -o $(PROJECT)-sch.ps -s /usr/share/gEDA/scheme/print.scm $(PROJECT).sch
+
+$(PROJECT)-sch.pdf:    $(PROJECT)-sch.ps
+       ps2pdf $(PROJECT)-sch.ps
+
+$(PROJECT)-pcb.ps:     $(PROJECT).pcb
+       pcb -x ps --psfile $(PROJECT)-pcb.ps --media Letter $(PROJECT).pcb
+
+$(PROJECT)-pcb.pdf:    $(PROJECT)-pcb.ps
+       ps2pdf $(PROJECT)-pcb.ps
+
+pdf:   $(PROJECT)-sch.pdf $(PROJECT)-pcb.pdf
 
-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