From 528a577782c80faef03661755b758dfcfdabc6ee Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Tue, 15 Mar 2011 01:16:44 -0300
Subject: [PATCH] atben/Makefile: merge comment layer (component references)
 into silk screen

- Makefile (GMERGE, gerber): use "gmerge" to merge Comments (which now
  only contains the component references) into SilkS_Front
- Makefile (gerbv): Comments is now redundant; removed it
---
 atben/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/atben/Makefile b/atben/Makefile
index 2433818..f455db2 100644
--- a/atben/Makefile
+++ b/atben/Makefile
@@ -1,5 +1,6 @@
 PLOT_BRD = pcbnew --plot=ps_a4 --ps-pads-drill-opt=none --fill-all-zones
 CPTX = ../../eda-tools/mlztx/cptx
+GMERGE = ../../eda-tools/gerber/gmerge
 
 NAME = atben
 VERSION = 110314
@@ -48,6 +49,9 @@ gerber:
 		  -l `pcbnew --list-layers $(NAME).brd | tr '\012' ,` \
 		  --fill-all-zones $(NAME).brd \
 		  --exclude-pcb-edge
+		$(GMERGE) $(NAME)-SilkS_Front.gto $(NAME)-Comments.gbr >_tmp \
+		  || { rm -rf _tmp; exit 1; }
+		mv _tmp $(NAME)-SilkS_Front.gto
 
 fab:		gerber
 		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(NAME).brd
@@ -59,8 +63,7 @@ fab:		gerber
 		  $(PCB_FILES:%=$(DIR)/%)
 
 gerbv:
-		gerbv $(NAME)-Comments.gbr \
-		  $(NAME)-SilkS_Front.gto \
+		gerbv $(NAME)-SilkS_Front.gto \
 		  $(NAME)-SoldP_Front.gtp \
 		  $(NAME)-Front.gtl \
 		  $(NAME)-Mask_Front.gts \