From: Keith Packard <keithp@keithp.com>
Date: Sat, 30 Mar 2013 05:37:24 +0000 (-0700)
Subject: Clean up generation of gerb files
X-Git-Tag: fab-v0.2~12
X-Git-Url: https://git.gag.com/?p=hw%2Ftelegps;a=commitdiff_plain;h=42a91e388c2c8e04a74f058111b8bcce53d5794c

Clean up generation of gerb files

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

diff --git a/Makefile b/Makefile
index 43eb9c6..058ab7d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ partslist.mouser: $(PROJECT).sch Makefile $(SCHEME)/gnet-partslist-bom.scm
 	gnetlist -L $(SCHEME) -g partslist-bom -Ovendor=mouser -o $@ $(PROJECT).sch
 
 muffin-5267.pdf: partslist.csv $(AM)/glabels/muffin-5267.glabels
-	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i partslist.csv -o muffin-5267.ps && ps2pdf muffin-5267.ps && rm muffin-5267.ps
+	glabels-3-batch $(AM)/glabels/muffin-5267.glabels -i partslist.csv -o muffin-5267.ps >/dev/null && ps2pdf muffin-5267.ps && rm muffin-5267.ps
 
 $(PROJECT).pcb: pcb
 
@@ -59,17 +59,17 @@ $(PROJECT).gerb: $(PROJECT).pcb
 	mv $(PROJECT).group2.gbr "$(PROJECT).Internal Plane 2".ger
 	touch $@
 
-zip: $(PROJECT).zip
+zip: $(PROJECT).zip $(PROJECT)-stencil.zip
 
 $(PROJECT).zip: $(PROJECT).gerb $(PROJECT).xy
-	rm -f $(PROJECT).zip
+	rm -f $@
 	zip $(PROJECT).zip $(GERB_FILES)
 
-stencil:	$(PROJECT).gerb
-	zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
+$(PROJECT)-stencil.zip:	$(PROJECT).gerb
+	rm -f $@
+	zip $@ $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
 
 clean:
 	rm -f *.bom *.drc *.log *~ $(PROJECT).ps $(GERB_FILES) $(PROJECT).gerb *bak* *- *.zip 
 	rm -f *.net *.cmd *.png partslist partslist.csv *.xy partslist.dk partslist.mouser muffin-5267.pdf
 	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls
-	rm -f $(PROJECT)-stencil.zip