From 2cfc20cf47fd33c412d4955b76c12e858ef7cec2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 10 Sep 2012 22:49:43 -0700
Subject: [PATCH] Generate .zip file more cleanly

Correct the dependencies so that the contents of the zip file get
generated when the .pcb file changes.

Don't require an explicit list of the zip file contents in the Makefile.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6efb4c2..c3e7105 100644
--- a/Makefile
+++ b/Makefile
@@ -42,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).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
+zip: $(PROJECT).zip
+
+$(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
 
-- 
2.30.2