From d79a71676675636b89c78ddcc41b6faea52d410d Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Wed, 30 Dec 2009 19:31:51 +0100
Subject: [PATCH] Allow overriding ENABLE_WARNINGS

Change occurences of @ENABLE_WARNINGS@ to $(ENABLE_WARNINGS) in
Makefile.am and Makefile.in. Then we can just override ENABLE_WARNINGS
on the make command line if necessary.

We require this to work around the flex generated code ignoring the
fwrite(3) return value, which generates a warning.
---
 src/Makefile.am          |    2 +-
 src/Makefile.in          |    2 +-
 src/disp-vcd/Makefile.am |    2 +-
 src/disp-vcd/Makefile.in |    2 +-
 src/disp/Makefile.am     |    2 +-
 src/disp/Makefile.in     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8cba01d..cbb59f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS              = getopt @ac_curses_disp_dirs@ disp-vcd
 DIST_SUBDIRS         = getopt disp disp-vcd
 
-AM_CFLAGS            = @ENABLE_WARNINGS@ \
+AM_CFLAGS            = $(ENABLE_WARNINGS) \
                        -I$(top_srcdir)/src/getopt
 
 bin_PROGRAMS         = simulavr
diff --git a/src/Makefile.in b/src/Makefile.in
index 921b5ce..61fb64d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -225,7 +225,7 @@ target_vendor = @target_vendor@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = getopt @ac_curses_disp_dirs@ disp-vcd
 DIST_SUBDIRS = getopt disp disp-vcd
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
                        -I$(top_srcdir)/src/getopt
 
 simulavr_LDADD = getopt/libgnugetopt.a
diff --git a/src/disp-vcd/Makefile.am b/src/disp-vcd/Makefile.am
index cfcae4f..bcf0ebc 100644
--- a/src/disp-vcd/Makefile.am
+++ b/src/disp-vcd/Makefile.am
@@ -29,7 +29,7 @@ simulavr_vcd_SOURCES = disp.c \
                        config_parser.y \
                        config_scanner.l
 
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
             -I$(top_srcdir)/src \
             -I$(top_srcdir)/src/getopt
 
diff --git a/src/disp-vcd/Makefile.in b/src/disp-vcd/Makefile.in
index bb22595..46fc128 100644
--- a/src/disp-vcd/Makefile.in
+++ b/src/disp-vcd/Makefile.in
@@ -219,7 +219,7 @@ simulavr_vcd_SOURCES = disp.c \
                        config_parser.y \
                        config_scanner.l
 
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
             -I$(top_srcdir)/src \
             -I$(top_srcdir)/src/getopt
 
diff --git a/src/disp/Makefile.am b/src/disp/Makefile.am
index 23238bd..99c6d95 100644
--- a/src/disp/Makefile.am
+++ b/src/disp/Makefile.am
@@ -25,6 +25,6 @@ bin_PROGRAMS          = simulavr-disp
 simulavr_disp_SOURCES = disp.c
 simulavr_disp_LDADD   = @ac_lib_curses@ ../getopt/libgnugetopt.a
 
-AM_CFLAGS             = @ENABLE_WARNINGS@ \
+AM_CFLAGS             = $(ENABLE_WARNINGS) \
                         -I$(top_srcdir)/src \
                         -I$(top_srcdir)/src/getopt
diff --git a/src/disp/Makefile.in b/src/disp/Makefile.in
index 4a266fd..f6b14f7 100644
--- a/src/disp/Makefile.in
+++ b/src/disp/Makefile.in
@@ -210,7 +210,7 @@ target_vendor = @target_vendor@
 MAINTAINERCLEANFILES = Makefile.in
 simulavr_disp_SOURCES = disp.c
 simulavr_disp_LDADD = @ac_lib_curses@ ../getopt/libgnugetopt.a
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
                         -I$(top_srcdir)/src \
                         -I$(top_srcdir)/src/getopt
 
-- 
1.6.2.5