X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=6efb4c24f923d67491e84cf60014e8d32d1272ff;hb=2eb52eb443ee706a9a17c636bc712dcc32e20148;hp=18735f786eb6071efd308bb82e6b27c6a32801dc;hpb=70c76fea4fa2fc5ec2578689bb95f8cd02f4c24c;p=hw%2Ftelelco

diff --git a/Makefile b/Makefile
index 18735f7..6efb4c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,25 @@
 PROJECT=telelco
 
 # intentionally want to rebuild drc and bom on every invocation
-all:	drc partslist partslist.csv pcb
+all:	drc pcb partslist partslist.csv partslist.dk
 
 drc:	$(PROJECT).sch Makefile
 	-gnetlist -g drc2 $(PROJECT).sch -o $(PROJECT).drc
 
 partslist:	$(PROJECT).sch Makefile
 	gnetlist -g bom -o $(PROJECT)-bom.unsorted $(PROJECT).sch
-	head -n1 $(PROJECT)-bom.unsorted > partslist
-	tail -n+2 $(PROJECT)-bom.unsorted | sort >> partslist
-#	rm -f $(PROJECT)-bom.unsorted
-
-partslist.csv:	$(PROJECT).sch Makefile
-	gnetlist -g partslist3 -o $(PROJECT)-list.unsorted $(PROJECT).sch
-	head -n1 $(PROJECT)-list.unsorted > partslist.csv
-	tail -n+2 $(PROJECT)-list.unsorted | sort -t \, -k 8 >> partslist.csv
-#	rm -f $(PROJECT)-list.unsorted
+	(head -n1 $(PROJECT)-bom.unsorted && tail -n+2 $(PROJECT)-bom.unsorted | sort) | nickle ./retab >> partslist
+	rm -f $(PROJECT)-bom.unsorted
+
+partslist.tab:	$(PROJECT).sch Makefile
+	gnetlist -l gnet-partslist-keithp.scm -g partslist-keithp -o $(PROJECT)-list.unsorted $(PROJECT).sch
+	nickle ./retab < $(PROJECT)-list.unsorted > $@
+
+partslist.csv:	$(PROJECT).sch Makefile gnet-partslist-csv.scm
+	gnetlist -l gnet-partslist-csv.scm -g partslist-csv -o $@ $(PROJECT).sch
+
+partslist.dk: 	$(PROJECT).sch Makefile gnet-partslist-bom.scm
+	gnetlist -m ./gnet-partslist-bom.scm -g partslist-bom -Ovendor=digikey -o $@ $(PROJECT).sch
 
 pcb:	$(PROJECT).sch project Makefile
 	gsch2pcb project