From 4db1ade3bdc9d9309f98f1b6bfb2c392abc45544 Mon Sep 17 00:00:00 2001
From: werner <werner@99fdad57-331a-0410-800a-d7fa5415bdb3>
Date: Wed, 19 Aug 2009 14:38:59 +0000
Subject: [PATCH] - Makefile: now requires /bin/bash (for PIPESTATUS) -
 Makefile: use PIPESTATUS to catch errors in the icon conversion pipe -
 Makefile: whitespace and comment cleanup - gui_style.c: removed no longer
 needed definition of INVALID

git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5487 99fdad57-331a-0410-800a-d7fa5415bdb3
---
 Makefile    | 21 ++++++++++-----------
 README      |  1 +
 TODO        |  7 ++++---
 gui_style.c |  3 ---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 822b710..f5b2ba1 100644
--- a/Makefile
+++ b/Makefile
@@ -24,17 +24,18 @@ XPMS = point.xpm delete.xpm delete_off.xpm \
        meas.xpm meas_x.xpm meas_y.xpm \
        stuff.xpm stuff_off.xpm meas_off.xpm
 
+SHELL = /bin/bash
 CFLAGS_GTK = `pkg-config --cflags gtk+-2.0`
 LIBS_GTK = `pkg-config --libs gtk+-2.0`
 
-CFLAGS_WARN=-Wall -Wshadow -Wmissing-prototypes \
-            -Wmissing-declarations -Wno-format-zero-length
-CFLAGS=-g -std=gnu99 $(CFLAGS_GTK) -DCPP='"cpp"' $(CFLAGS_WARN)
-SLOPPY=-Wno-unused -Wno-implicit-function-declaration -Wno-missing-prototypes \
-       -Wno-missing-declarations
+CFLAGS_WARN = -Wall -Wshadow -Wmissing-prototypes \
+	      -Wmissing-declarations -Wno-format-zero-length
+CFLAGS = -g -std=gnu99 $(CFLAGS_GTK) -DCPP='"cpp"' $(CFLAGS_WARN)
+SLOPPY = -Wno-unused -Wno-implicit-function-declaration \
+	 -Wno-missing-prototypes -Wno-missing-declarations
 LDLIBS = -lm -lfl $(LIBS_GTK)
-YACC=bison -y
-YYFLAGS=-v
+YACC = bison -y
+YYFLAGS = -v
 
 # ----- Verbosity control -----------------------------------------------------
 
@@ -75,13 +76,11 @@ endif
 
 # generate 26x26 pixels icons, then drop the 1-pixel frame
 
-# this adds a magenta border
-# sed '/2 2 0 1 /{s//2 2 0 15 /;s/ 0 7 / 22 7 /;}' $< | \
-
 .fig.xpm:
 		$(GEN) fig2dev -L xpm -Z 0.32 -S 4 $< | \
 		  convert -crop 24x24+1+1 - - | \
-		  sed "s/*.*\[]/*xpm_`basename $@ .xpm`[]/" >$@
+		  sed "s/*.*\[]/*xpm_`basename $@ .xpm`[]/" >$@; \
+		  [ "$${PIPESTATUS[*]}" = "0 0 0" ] || { rm -f $@; exit 1; }
 
 all:		fped
 
diff --git a/README b/README
index 038fc9d..7750626 100644
--- a/README
+++ b/README
@@ -15,6 +15,7 @@ Building
 
 Prerequisites:
 
+- bash
 - flex
 - bison
 - fig2dev
diff --git a/TODO b/TODO
index 1bea5fd..3460d2f 100644
--- a/TODO
+++ b/TODO
@@ -20,7 +20,6 @@ Style:
   upper toolbar
 - status area looks awful
 - add button with GTK_STOCK_UNDELETE for "undelete" to menu bar
-- edit names/values/etc. in place if possible
 - maximizing pad name size creates uneven text sizes. Particularly "1" gets
   excessively large.
 - pango_layout_get_size doesn't seem to consider rotation, so we currently
@@ -66,12 +65,14 @@ Open decisions:
   we can already approximate this by introducing an intermediate table that
   sets up the arguments (provided that we don't consider vectors as well)
 - Q: should we make it a requirement to generate objects only once ?
-  A: almost certainly yes.
+  A: yes.
 
 Future directions:
 - future: consider using cairo instead of gdk
 - live update of value when entering strings and expressions ?
 - advanced: non-standard solder mask
 - advanced: solder paste exceptions (subtractive, additive)
+- advanced: holes
 - advanced: silk line width
-- future: consider editing non-canvas items in place
+- future: consider editing non-canvas items (e.g., variable names/values) in
+  place
diff --git a/gui_style.c b/gui_style.c
index 2247f48..c355bb4 100644
--- a/gui_style.c
+++ b/gui_style.c
@@ -18,9 +18,6 @@
 #include "gui_style.h"
 
 
-#define	INVALID	"#00ffff"
-
-
 GdkGC *gc_bg, *gc_bg_error;
 GdkGC *gc_drag;
 GdkGC *gc_highlight;