Switch to using preferred-parts.ods in makefile fragments

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

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index d41f7801f725bdac793f44dfd67795e043614889..e5827ba9d54396e518e5b8849b43f27f0ebc533e 100644 (file)
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -26,14 +26,13 @@ partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslis
 
 partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        lepton-netlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-       head -n1 $(PROJECT).unsorted > partslist
-       tail -n+2 $(PROJECT).unsorted | sort | awk -f $(AM)/bin/fillpartslist >> partslist
+       $(AM)/bin/fillpartslist.py < $(PROJECT).unsorted > $@
        rm -f $(PROJECT).unsorted
 
 partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        lepton-netlist -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
+       $(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+       rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv
        $(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@

diff --git a/pcb.mk b/pcb.mk
index f282013f655fd583afe17217c9bcb6c421ec8f84..ed4fa90609b23829500e5a16afa40f3e2ee9fe30 100644 (file)
--- a/pcb.mk
+++ b/pcb.mk
@@ -26,13 +26,13 @@ partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslis
 
 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
+       $(AM)/bin/fillpartslist.py  < $(PROJECT).unsorted > $@
        rm -f $(PROJECT).unsorted
 
 partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        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
+       $(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+       rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv
        $(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@