X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=158ca08b5680ad212fcd752609be29d42ee17d7c;hb=48aa060f9316da618447e762d39730940d5c77a7;hp=cbf16041284c04ee09c044d7512c25a01d14ed20;hpb=52bb373f040106c31eaa6c2f1ec726995ee70e2f;p=hw%2Ftelelco

diff --git a/Makefile b/Makefile
index cbf1604..158ca08 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +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).unsorted $(PROJECT).sch
-	head -n1 $(PROJECT).unsorted > partslist
-	tail -n+2 $(PROJECT).unsorted | sort >> partslist
-	rm -f $(PROJECT).unsorted
+	gnetlist -g bom -o $(PROJECT)-bom.unsorted $(PROJECT).sch
+	(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
-	gnetlist -g partslist3 -o $(PROJECT).unsorted $(PROJECT).sch
-	head -n1 $(PROJECT).unsorted > partslist.csv
-	tail -n+2 $(PROJECT).unsorted | sort -t \, -k 8 >> partslist.csv
-	rm -f $(PROJECT).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
@@ -40,14 +42,19 @@ push:
 $(PROJECT).xy:	$(PROJECT).pcb
 	pcb -x bom $(PROJECT).pcb
 
-$(PROJECT).back.gbr:	$(PROJECT).pcb
+$(PROJECT).gerb: $(PROJECT).pcb
+	rm -f *.gbr *.cnc
 	pcb -x gerber $(PROJECT).pcb
+	touch $@
+
+zip: $(PROJECT).zip
 
-zip:	$(PROJECT).bottom.gbr $(PROJECT).bottommask.gbr $(PROJECT).fab.gbr $(PROJECT).top.gbr $(PROJECT).topmask.gbr $(PROJECT).toppaste.gbr $(PROJECT).topsilk.gbr $(PROJECT).plated-drill.cnc $(PROJECT).xy  Makefile # $(PROJECT).xls
-	zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
+$(PROJECT).zip: $(PROJECT).gerb $(PROJECT).xy
+	rm -f $(PROJECT).zip
+	zip $(PROJECT).zip *.gbr *.cnc *.xy
 
 clean:
-	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr *.cnc *bak* *- *.zip 
+	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr $(PROJECT).gerb *.cnc *bak* *- *.zip 
 	rm -f *.net *.xy *.cmd *.png partslist partslist.csv
 	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls