Pass fillparts parameters on the command line

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

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index e5827ba9d54396e518e5b8849b43f27f0ebc533e..3c7e7ca13f94f91bb2cdf065dea4be6a3cf5da29 100644 (file)
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -24,14 +24,14 @@ $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
 
 partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist-other.csv
 
-partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
        lepton-netlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-       $(AM)/bin/fillpartslist.py < $(PROJECT).unsorted > $@
+       $(AM)/bin/fillpartslist.py $(PROJECT).unsorted --output $@ --preferred $(AM)/preferred-parts.ods
        rm -f $(PROJECT).unsorted
 
-partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
        lepton-netlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
-       $(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+       $(AM)/bin/fillpartscsv.py $(PROJECT).csvtmp --output $@ --preferred $(AM)/preferred-parts.ods
        rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv

diff --git a/pcb.mk b/pcb.mk
index ed4fa90609b23829500e5a16afa40f3e2ee9fe30..b5b95029d1081e441d6f71e00e3fbb983de657e1 100644 (file)
--- a/pcb.mk
+++ b/pcb.mk
@@ -24,14 +24,14 @@ $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
 
 partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist-other.csv
 
-partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
        gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
-       $(AM)/bin/fillpartslist.py  < $(PROJECT).unsorted > $@
+       $(AM)/bin/fillpartslist.py $(PROJECT).unsorted --output $@ --preferred $(AM)/preferred-parts.ods
        rm -f $(PROJECT).unsorted
 
-partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
+partslist.csv: $(SCHEMATICS) Makefile $(AM)/preferred-parts.ods $(CONFIG)
        gnetlist -L $(SCHEME) -g bomAM -o $(PROJECT).csvtmp $(SCHEMATICS)
-       $(AM)/bin/fillpartscsv.py < $(PROJECT).csvtmp > $@
+       $(AM)/bin/fillpartscsv.py $(PROJECT).csvtmp --output $@ --preferred $(AM)/preferred-parts.ods
        rm -f $(PROJECT).csvtmp
 
 partslist-dk.csv: partslist.csv