From ea55215e3c3a0f622ca951f35a134bff13910240 Mon Sep 17 00:00:00 2001
From: Lev Walkin <vlm@lionet.info>
Date: Tue, 14 Jan 2014 02:15:13 -0800
Subject: [PATCH] split ADD_CFLAGS and TESTSUITE_CFLAGS

---
 Makefile.in                            | 1 +
 asn1c/Makefile.in                      | 1 +
 asn1c/tests/Makefile.in                | 1 +
 configure                              | 3 +++
 configure.ac                           | 2 ++
 doc/Makefile.in                        | 1 +
 doc/docsrc/Makefile.in                 | 1 +
 examples/Makefile.in                   | 1 +
 libasn1compiler/Makefile.in            | 1 +
 libasn1fix/Makefile.in                 | 1 +
 libasn1parser/Makefile.in              | 1 +
 libasn1print/Makefile.in               | 1 +
 skeletons/Makefile.in                  | 1 +
 skeletons/standard-modules/Makefile.in | 1 +
 skeletons/tests/Makefile.in            | 1 +
 tests/Makefile.in                      | 1 +
 16 files changed, 19 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index f19c0ffd..0fafb6a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,6 +130,7 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/asn1c/Makefile.in b/asn1c/Makefile.in
index 2cc29e83..13cd0815 100644
--- a/asn1c/Makefile.in
+++ b/asn1c/Makefile.in
@@ -148,6 +148,7 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index 01d5fa4a..b6ff0163 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -53,6 +53,7 @@ am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/configure b/configure
index 44fb8461..52fb46bc 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,7 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 TESTSUITE_CFLAGS
+ADD_CFLAGS
 LEXLIB
 LEX_OUTPUT_ROOT
 LEX
@@ -12390,9 +12391,11 @@ fi
 
 if test x$enable_werror = xyes; then
   TESTSUITE_CFLAGS="-Werror -W -Wpointer-arith"
+  ADD_CFLAGS="-Werror -W -Wpointer-arith"
 fi
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wall" >&5
 $as_echo_n "checking whether C compiler accepts -Wall... " >&6; }
 if ${ax_cv_check_cflags___Wall+:} false; then :
diff --git a/configure.ac b/configure.ac
index e04f3a3c..287f023d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,9 @@ AC_ARG_ENABLE(Werror,
 	enable_werror=$enableval, enable_werror=no)
 if test x$enable_werror = xyes; then
   TESTSUITE_CFLAGS="-Werror -W -Wpointer-arith"
+  ADD_CFLAGS="-Werror -W -Wpointer-arith"
 fi
+AC_SUBST(ADD_CFLAGS)
 AC_SUBST(TESTSUITE_CFLAGS)
 
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9632bff2..ad96c581 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -114,6 +114,7 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/doc/docsrc/Makefile.in b/doc/docsrc/Makefile.in
index a61eb0f9..2df22902 100644
--- a/doc/docsrc/Makefile.in
+++ b/doc/docsrc/Makefile.in
@@ -50,6 +50,7 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 0c4413bb..17307785 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -75,6 +75,7 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/libasn1compiler/Makefile.in b/libasn1compiler/Makefile.in
index 241a2eb3..eb883d1b 100644
--- a/libasn1compiler/Makefile.in
+++ b/libasn1compiler/Makefile.in
@@ -75,6 +75,7 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/libasn1fix/Makefile.in b/libasn1fix/Makefile.in
index 6a1b2501..5acf67b6 100644
--- a/libasn1fix/Makefile.in
+++ b/libasn1fix/Makefile.in
@@ -84,6 +84,7 @@ am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/libasn1parser/Makefile.in b/libasn1parser/Makefile.in
index 4e0902be..d58cae4d 100644
--- a/libasn1parser/Makefile.in
+++ b/libasn1parser/Makefile.in
@@ -76,6 +76,7 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/libasn1print/Makefile.in b/libasn1print/Makefile.in
index 002df893..d78dbfbb 100644
--- a/libasn1print/Makefile.in
+++ b/libasn1print/Makefile.in
@@ -73,6 +73,7 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/skeletons/Makefile.in b/skeletons/Makefile.in
index 35e070ed..cadb8f41 100644
--- a/skeletons/Makefile.in
+++ b/skeletons/Makefile.in
@@ -184,6 +184,7 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/skeletons/standard-modules/Makefile.in b/skeletons/standard-modules/Makefile.in
index d52d2149..5e0ccf53 100644
--- a/skeletons/standard-modules/Makefile.in
+++ b/skeletons/standard-modules/Makefile.in
@@ -75,6 +75,7 @@ am__installdirs = "$(DESTDIR)$(smodsdir)"
 DATA = $(dist_smods_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/skeletons/tests/Makefile.in b/skeletons/tests/Makefile.in
index 43d577f6..a4f8658c 100644
--- a/skeletons/tests/Makefile.in
+++ b/skeletons/tests/Makefile.in
@@ -128,6 +128,7 @@ am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d0d87275..8f939049 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -50,6 +50,7 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADD_CFLAGS = @ADD_CFLAGS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@