DK won't take a parts list without .csv suffix now, so rename partlist.dk

diff --git a/pcb-rnd.mk b/pcb-rnd.mk
index da4ea57d4c9c5e2ac9b1abc412ed458a6a1cdb63..5122a1866695e067ade2daf17a2893d90861ed0b 100644 (file)
--- a/pcb-rnd.mk
+++ b/pcb-rnd.mk
@@ -22,7 +22,7 @@ drc:  $(PROJECT).drc
 $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
        -lepton-netlist -g drc2 $(SCHEMATICS) -o $@
 
-partslists: partslist partslist.csv partslist.dk partslist-check.dk partslist-mouser.csv partslist.other
+partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist.other
 
 partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        lepton-netlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
@@ -35,7 +35,7 @@ partslist.csv:        $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        (head -n1 $(PROJECT).csvtmp; tail -n+2 $(PROJECT).csvtmp | sort -t \, -k 8 | \
                awk -f $(AM)/bin/fillpartscsv | sort ) > $@ && rm -f $(PROJECT).csvtmp
 
-partslist.dk: partslist.csv
+partslist-dk.csv: partslist.csv
        $(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
 
 partslist-check.dk: partslist.csv
@@ -232,7 +232,7 @@ 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 *.unsorted $(PROJECT).xls muffin-5267.pdf muffin-keithp.pdf
-       rm -f partslist-check.dk partslist.dk partslist-mouser.csv partslist.other
+       rm -f partslist-check.dk partslist-dk.csv partslist-mouser.csv partslist.other
        rm -f $(PROJECT)-sch.ps $(PROJECT)-sch.pdf $(PROJECT)-pcb.ps $(PROJECT)-pcb.pdf
        rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp $(PROJECT).ncd
        rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts

diff --git a/pcb.mk b/pcb.mk
index 9e44810afa99fdc140618ca9a74551aea7f04344..f618e5f139e363e639fbcb7bca5204e75eecb451 100644 (file)
--- a/pcb.mk
+++ b/pcb.mk
@@ -22,7 +22,7 @@ drc:  $(PROJECT).drc
 $(PROJECT).drc: $(SCHEMATICS) Makefile $(CONFIG)
        -gnetlist -g drc2 $(SCHEMATICS) -o $@
 
-partslists: partslist partslist.csv partslist.dk partslist-check.dk partslist-mouser.csv partslist.other
+partslists: partslist partslist.csv partslist-dk.csv partslist-check.dk partslist-mouser.csv partslist.other
 
 partslist:     $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        gnetlist -g bom -o $(PROJECT).unsorted $(SCHEMATICS)
@@ -34,7 +34,7 @@ partslist.csv:        $(SCHEMATICS) Makefile $(AM)/preferred-parts $(CONFIG)
        gnetlist -L $(SCHEME) -g partslistgag -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
 
-partslist.dk: partslist.csv
+partslist-dk.csv: partslist.csv
        $(AM)/bin/partslist-vendor --vendor digikey partslist.csv > $@
 
 partslist-check.dk: partslist.csv
@@ -232,7 +232,7 @@ 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 muffin-keithp.pdf
-       rm -f partslist-check.dk partslist.dk partslist-mouser.csv partslist.other
+       rm -f partslist-check.dk partslist-dk.csv partslist-mouser.csv partslist.other
        rm -f $(PROJECT)-sch.ps $(PROJECT)-sch.pdf $(PROJECT)-pcb.ps $(PROJECT)-pcb.pdf
        rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp $(PROJECT).ncd
        rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts