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>

diff --git a/Makefile b/Makefile
index 6efb4c24f923d67491e84cf60014e8d32d1272ff..c3e7105172fcca0d9c94f8f8457f7dc6d9111deb 100644 (file)
--- 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