X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=pcb.mk;h=1ed68b22b214e02577b0ab439b41b62a1321e584;hb=bead7b03cd60810bcae311f64cdd4b7ccb866a72;hp=8e927a27c77c930b8968d09f7190ebac330c7888;hpb=e96b3b3be9dd91b9450ea60fa18db2527cb5e1be;p=hw%2Faltusmetrum

diff --git a/pcb.mk b/pcb.mk
index 8e927a2..1ed68b2 100644
--- a/pcb.mk
+++ b/pcb.mk
@@ -79,14 +79,14 @@ $(PROJECT).all-drill.cnc: $(PROJECT).bottom.gbr
 zip: $(PROJECT).zip
 
 $(PROJECT).zip: $(PROJECT).bottom.gbr $(PROJECT).xy Makefile
-	zip $(PROJECT).zip $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
+	rm -f $@ && zip $@ $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls
 
 ac: $(PROJECT)-ac.zip $(PROJECT)-bom.csv
 
 $(PROJECT)-bom.csv: partslist.csv
 	cp partslist.csv $@
 
-$(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr
+$(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr $(PROJECT).xy
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -115,7 +115,7 @@ $(PROJECT)-ac.zip:  $(PROJECT).bottom.gbr
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $@ \
+	rm -f $@ && zip $@ \
 		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
 		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
 		$(PROJECT).gml $(PROJECT).ncd $(PROJECT).gml $(PROJECT).drd \
@@ -144,11 +144,11 @@ $(PROJECT)-oshpark.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc
 		cp $(PROJECT).group2.gbr internal\ plane\ 1.ger; \
 		cp $(PROJECT).group3.gbr internal\ plane\ 2.ger; \
 	fi
-	zip $(PROJECT)-oshpark.zip *.ger *.xln
+	rm -f $@ && zip $@ *.ger *.xln
 
 seeed: $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv
 
-$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(SEEED_EXTRA)
+$(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(PROJECT).xy $(SEEED_EXTRA)
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -174,7 +174,7 @@ $(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $(PROJECT)-seeed.zip \
+	rm -f $@ && zip $@ \
 		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
 		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
 		$(PROJECT).gml $(PROJECT).txt \
@@ -184,7 +184,7 @@ $(PROJECT)-seeed.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-
 
 goldphoenix: $(PROJECT)-goldphoenix.zip
 
-$(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf  $(PROJECT)-goldphoenix.csv
+$(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PROJECT)-sch.pdf $(PROJECT).xy $(PROJECT)-goldphoenix.csv
 	cp $(PROJECT).bottom.gbr $(PROJECT).gbl
 	cp $(PROJECT).bottommask.gbr $(PROJECT).gbs
 	if [ -f $(PROJECT).bottomsilk.gbr ]; then \
@@ -210,7 +210,7 @@ $(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PRO
 		cp $(PROJECT).group2.gbr $(PROJECT).gl2; \
 		cp $(PROJECT).group3.gbr $(PROJECT).gl3; \
 	fi
-	zip $(PROJECT)-goldphoenix.zip \
+	rm -f $@ && zip $@ \
 		$(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \
 		$(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \
 		$(PROJECT).gml $(PROJECT).txt \
@@ -219,7 +219,7 @@ $(PROJECT)-goldphoenix.zip: $(PROJECT).bottom.gbr $(PROJECT).all-drill.cnc $(PRO
 		$(PROJECT)-goldphoenix.csv
 
 stencilsunlimited:	$(PROJECT).bottom.gbr $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
-	zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
+	rm -f $(PROJECT)-stencil.zip && zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(PROJECT).outline.gbr
 
 stencil:	$(PROJECT).pcb
 	pcb -x gerber --paste-adjust -0.075 $(PROJECT).pcb
@@ -228,10 +228,10 @@ stencil:	$(PROJECT).pcb
 clean:
 	rm -f *.bom *.drc *.log *~ $(PROJECT).ps *.gbr *.cnc *bak* *- *.zip 
 	rm -f *.net *.xy *.cmd *.png partslist partslist.csv *.ger *.xln
-	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls muffin-5267.pdf
+	rm -f *.partslist *.new.pcb *.unsorted $(PROJECT).xls muffin-5267.pdf muffin-keithp.pdf
 	rm -f partslist-check.dk partslist.dk partslist-mouser.csv partslist.other
 	rm -f $(PROJECT)-sch.ps $(PROJECT)-sch.pdf $(PROJECT)-pcb.ps $(PROJECT)-pcb.pdf
-	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp
+	rm -f $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp $(PROJECT).ncd
 	rm -f $(PROJECT).gto $(PROJECT).gtp $(PROJECT).gml $(PROJECT).gtl $(PROJECT).gts
 	rm -f $(PROJECT).txt $(PROJECT).gl2 $(PROJECT).gl3
 	rm -f $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv