Switch to gnetlist -L. Use shared altusmetrum/scheme files

This loads the gnetlist guile bits from ../altusmetrum/scheme

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/Makefile b/Makefile
index 5b6a1a884c9b261dbde58afd04a28e63208d63dc..c50b8049753e03553243e770ceb4f2681895dfe6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,32 @@
 PROJECT=teleterra
+AM=../altusmetrum
+SCHEME=$(AM)/scheme
+NICKLE=$(AM)/nickle
 
 # intentionally want to rebuild drc and bom on every invocation
 all:   hw
 
 hw:    drc partslist partslist.csv partslist.dk partslist.mouser
 
-CC=            sdcc
-CFLAGS=                -mpic14 -p16f886
-LDFLAGS=       
-
 drc:   teleterra.sch
-       -gnetlist -g drc2 teleterra.sch -o teleterra.drc
+       gnetlist -L $(SCHEME) -g drc2 teleterra.sch -o teleterra.drc
 
 partslist:     teleterra.sch
-       gnetlist -g bom -o teleterra.unsorted teleterra.sch
-       head -n1 teleterra.unsorted > partslist
-       tail -n+2 teleterra.unsorted | sort >> partslist
-       rm -f teleterra.unsorted
+       gnetlist -L $(SCHEME) -g bom -o teleterra.unsorted teleterra.sch
+       (head -n1 teleterra.unsorted; tail -n+2 teleterra.unsorted | sort) | nickle $(NICKLE)/retab > $@ && rm -f teleterra.unsorted
 
 partslist.csv: teleterra.sch Makefile
-       gnetlist -m scheme/gnet-partslistgag.scm -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 scheme/gnet-partslist-bom.scm
-       gnetlist -m scheme/gnet-partslist-bom.scm -g partslist-bom -Ovendor=digikey -o $@ $(PROJECT).sch
+partslist.dk:  teleterra.sch Makefile scheme/gnet-partslist-bom.scm
+       gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=digikey -o $@ teleterra.sch
 
-partslist.mouser:      $(PROJECT).sch Makefile scheme/gnet-partslist-bom.scm
-       gnetlist -m scheme/gnet-partslist-bom.scm -g partslist-bom -Ovendor=mouser -o $@ $(PROJECT).sch
+partslist.mouser:      teleterra.sch Makefile scheme/gnet-partslist-bom.scm
+       gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=mouser -o $@ teleterra.sch
 
 pcb:   teleterra.sch project
        gsch2pcb project