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

diff --git a/Makefile b/Makefile
index 2ca1d76..158ca08 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,16 @@ drc:	$(PROJECT).sch Makefile
 
 partslist:	$(PROJECT).sch Makefile
 	gnetlist -g bom -o $(PROJECT)-bom.unsorted $(PROJECT).sch
-	(head -n1 $(PROJECT)-bom.unsorted && tail -n+2 $(PROJECT)-bom.unsorted | sort) | nickle ./retab >> partslist
+	(head -n1 $(PROJECT)-bom.unsorted && tail -n+2 $(PROJECT)-bom.unsorted | sort) | nickle ./retab > partslist
 	rm -f $(PROJECT)-bom.unsorted
 
-partslist.csv:	$(PROJECT).sch Makefile gnet-partslist-keithp.scm
+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
 
@@ -39,14 +42,19 @@ push:
 $(PROJECT).xy:	$(PROJECT).pcb
 	pcb -x bom $(PROJECT).pcb
 
-$(PROJECT).bottom.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