From b668387d917cd80c5d4b9631bc0008b6a014c083 Mon Sep 17 00:00:00 2001
From: Martin Lucina <mato@kotelna.sk>
Date: Sat, 10 Apr 2010 17:04:33 +0200
Subject: Remove -Wxxx gcc-isms from subdir Makefiles

---
 configure.in                      | 6 +++---
 devices/zmq_forwarder/Makefile.am | 1 -
 devices/zmq_queue/Makefile.am     | 1 -
 devices/zmq_streamer/Makefile.am  | 1 -
 perf/Makefile.am                  | 4 ----
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index ae944b4..a196a35 100644
--- a/configure.in
+++ b/configure.in
@@ -365,14 +365,14 @@ fi
 # -Wall, -Werror and -pedantic are GNU compiler specific.
 # Also, these break OpenPGM so don't specify them if we are building with it.
 if test "x$gnu_compilers" = "xyes" -a "x$pgm_ext" = "xno"; then
-    LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Wall"
+    CPPFLAGS="-Wall $CPPFLAGS"
 
     if test "x$pedantic" = "xyes"; then
-	LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -pedantic"
+	CPPFLAGS="-pedantic $CPPFLAGS"
     fi
 
     if test "x$werror" = "xyes"; then
-	LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror"
+	CPPFLAGS="-Werror $CPPFLAGS"
     fi
 fi
 
diff --git a/devices/zmq_forwarder/Makefile.am b/devices/zmq_forwarder/Makefile.am
index ee48cda..ca29fa5 100644
--- a/devices/zmq_forwarder/Makefile.am
+++ b/devices/zmq_forwarder/Makefile.am
@@ -4,6 +4,5 @@ bin_PROGRAMS = zmq_forwarder
 
 zmq_forwarder_LDADD = $(top_builddir)/src/libzmq.la
 zmq_forwarder_SOURCES = zmq_forwarder.cpp
-zmq_forwarder_CXXFLAGS = -Wall -pedantic -Werror
 
 
diff --git a/devices/zmq_queue/Makefile.am b/devices/zmq_queue/Makefile.am
index 8d3ec36..416cb21 100644
--- a/devices/zmq_queue/Makefile.am
+++ b/devices/zmq_queue/Makefile.am
@@ -4,6 +4,5 @@ bin_PROGRAMS = zmq_queue
 
 zmq_queue_LDADD = $(top_builddir)/src/libzmq.la
 zmq_queue_SOURCES = zmq_queue.cpp
-zmq_queue_CXXFLAGS = -Wall -pedantic -Werror
 
 
diff --git a/devices/zmq_streamer/Makefile.am b/devices/zmq_streamer/Makefile.am
index 9e0ac62..b6ab8fa 100644
--- a/devices/zmq_streamer/Makefile.am
+++ b/devices/zmq_streamer/Makefile.am
@@ -4,6 +4,5 @@ bin_PROGRAMS = zmq_streamer
 
 zmq_streamer_LDADD = $(top_builddir)/src/libzmq.la
 zmq_streamer_SOURCES = zmq_streamer.cpp
-zmq_streamer_CXXFLAGS = -Wall -pedantic -Werror
 
 
diff --git a/perf/Makefile.am b/perf/Makefile.am
index fe35ff3..cf95a12 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -8,19 +8,15 @@ noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr $(PGM_EXAMPLES_BINS)
 
 local_lat_LDADD = $(top_builddir)/src/libzmq.la
 local_lat_SOURCES = local_lat.cpp
-local_lat_CXXFLAGS = -Wall -pedantic -Werror
 
 remote_lat_LDADD = $(top_builddir)/src/libzmq.la
 remote_lat_SOURCES = remote_lat.cpp
-remote_lat_CXXFLAGS = -Wall -pedantic -Werror
 
 local_thr_LDADD = $(top_builddir)/src/libzmq.la
 local_thr_SOURCES = local_thr.cpp
-local_thr_CXXFLAGS = -Wall -pedantic -Werror
 
 remote_thr_LDADD = $(top_builddir)/src/libzmq.la
 remote_thr_SOURCES = remote_thr.cpp
-remote_thr_CXXFLAGS = -Wall -pedantic -Werror
 
 if BUILD_PGM_EXAMPLES
 
-- 
cgit v1.2.3