update Makefile to use current best practices

diff --git a/Makefile b/Makefile
index ffd17a74ce0b31f612b5132a1c3b485b43a0b1df..fb809aa9a85f37e1e78d3aebbdae8ada65c1642c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,26 @@
-PROJECT=teleterra
+AM=../altusmetrum
+SCHEME=$(AM)/scheme
 
 # intentionally want to rebuild drc and bom on every invocation
-all:   hw
+all:   drc partslist partslist.csv pcb
 
-hw:    drc partslist partslist.csv partslist.dk partslist.mouser
-
-CC=            sdcc
-CFLAGS=                -mpic14 -p16f886
-LDFLAGS=       
-
-drc:   teleterra.sch
+drc:   teleterra.sch Makefile
        -gnetlist -g drc2 teleterra.sch -o teleterra.drc
 
-partslist:     teleterra.sch
+partslist:     teleterra.sch Makefile
        gnetlist -g bom -o teleterra.unsorted teleterra.sch
        head -n1 teleterra.unsorted > partslist
        tail -n+2 teleterra.unsorted | sort >> partslist
        rm -f teleterra.unsorted
 
 partslist.csv: teleterra.sch Makefile
-       gnetlist -L ../altusmetrum/scheme -g partslistgag \
+       gnetlist -L $(SCHEME) -g partslistgag \
                -o teleterra.unsorted teleterra.sch
        head -n1 teleterra.unsorted > partslist.csv
        tail -n+2 teleterra.unsorted | sort -t \, -k 8 >> partslist.csv
        rm -f teleterra.unsorted
 
-partslist.dk:  $(PROJECT).sch Makefile 
-       gnetlist -L ../altusmetrum/scheme -g partslist-bom -Ovendor=digikey -o $@ $(PROJECT).sch
-
-partslist.mouser:      $(PROJECT).sch Makefile
-       gnetlist -L ../altusmetrum/scheme -g partslist-bom -Ovendor=mouser -o $@ $(PROJECT).sch
-
-pcb:   teleterra.sch project
+pcb:   teleterra.sch project Makefile
        gsch2pcb project
 
 # note that 'gschlas -e foo.sch' will embed all symbols in the schematic, this
@@ -55,8 +44,8 @@ teleterra.xy: teleterra.pcb
 teleterra.bottom.gbr:  teleterra.pcb
        pcb -x gerber teleterra.pcb
 
-zip:   teleterra.bottom.gbr teleterra.bottommask.gbr teleterra.fab.gbr teleterra.top.gbr teleterra.topmask.gbr teleterra.toppaste.gbr teleterra.topsilk.gbr teleterra.plated-drill.cnc
-       zip teleterra.zip *.gbr *.cnc
+zip:   teleterra.bottom.gbr teleterra.bottommask.gbr teleterra.fab.gbr teleterra.top.gbr teleterra.topmask.gbr teleterra.toppaste.gbr teleterra.topsilk.gbr teleterra.group2.gbr teleterra.group3.gbr teleterra.plated-drill.cnc teleterra.xy  Makefile # teleterra.xls
+       zip teleterra.zip teleterra.*.gbr teleterra.*.cnc teleterra.xy # teleterra.xls
 
 oshpark: teleterra.bottom.gbr teleterra.bottommask.gbr teleterra.top.gbr teleterra.topmask.gbr teleterra.topsilk.gbr teleterra.plated-drill.cnc
        mv teleterra.bottom.gbr bottom\ layer.ger
@@ -67,6 +56,8 @@ oshpark: teleterra.bottom.gbr teleterra.bottommask.gbr teleterra.top.gbr teleter
        mv teleterra.topmask.gbr top\ solder\ mask.ger
        mv teleterra.topsilk.gbr top\ silk\ screen.ger
        mv teleterra.plated-drill.cnc drills.xln
+       mv teleterra.group2.gbr internal\ plane\ 1.ger
+       mv teleterra.group3.gbr internal\ plane\ 2.ger
        zip teleterra-oshpark.zip *.ger *.xln
 
 stencil:       teleterra.bottom.gbr teleterra.toppaste.gbr teleterra.outline.gbr
@@ -74,8 +65,11 @@ stencil:     teleterra.bottom.gbr teleterra.toppaste.gbr teleterra.outline.gbr
 
 clean:
        rm -f *.bom *.drc *.log *~ teleterra.ps *.gbr *.cnc *bak* *- *.zip 
-       rm -f *.net *.xy *.cmd *.png partslist partslist.csv
-       rm -f *.partslist *.new.pcb *.unsorted
-       rm -f *.hex *.cod *.lst *.ps *.o *.asm
-       rm -f *.ger *.xln *.dk *.mouser
+       rm -f *.net *.xy *.cmd *.png partslist partslist.csv *.ger *.xln
+       rm -f *.partslist *.new.pcb *.unsorted teleterra.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
 

diff --git a/labeldata.glabels b/labeldata.glabels
deleted file mode 100644 (file)
index de69a0c..0000000
Binary files a/labeldata.glabels and /dev/null differ