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 e6fd21de4ca99fd66ee435edac54ab87989b173a..97885f867cc43b3dcc4cd818383a191f0568ae97 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,15 +39,18 @@ 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).zip: $(PROJECT).gerb $(PROJECT).xy
        rm -f $(PROJECT).zip
-       zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
+       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
-