aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2008-09-21 14:59:05 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2008-09-21 14:59:05 +0000
commitc08a1f420e484941db43234a2236c57df6a9ef45 (patch)
tree848dcdef95f471fb8d136f05cc0e7f795c4bb6a4 /Makefile.am
parent4dcba9a359805e57ec263e3238881f507d1f94a6 (diff)
Turn on -Werror for the top level targets, excluding text2pcap (which includes some generated code).
svn path=/trunk/; revision=26245
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am17
1 files changed, 17 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 29580b12a6..7d3de6b8c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,9 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
INCLUDES= @LUA_INCLUDES@
+if HAVE_WARNINGS_AS_ERRORS
+AM_CLEAN_CFLAGS = -Werror
+endif
#
# This is a hideous hack.
@@ -326,6 +329,7 @@ wireshark_LDADD = \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
@PORTAUDIO_LIBS@
+wireshark_CFLAGS = $(AM_CLEAN_CFLAGS)
if ENABLE_STATIC
tshark_LDFLAGS = -Wl,-static -all-static
@@ -355,6 +359,7 @@ tshark_LDADD = \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
+tshark_CFLAGS = $(AM_CLEAN_CFLAGS)
if ENABLE_STATIC
rawshark_LDFLAGS = -Wl,-static -all-static
@@ -384,6 +389,7 @@ rawshark_LDADD = \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
+rawshark_CFLAGS = $(AM_CLEAN_CFLAGS)
# Optional objects that I know how to build, and that are needed by
# text2pcap.
@@ -395,24 +401,32 @@ text2pcap_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@ -lm
+# Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c
+# which is generated (and therefore not always clean).
+# We could generate text2pcap.o as a library with -Werror but for now it
+# doesn't seem worth the effort.
+#text2pcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link mergecap.
mergecap_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@
+mergecap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link capinfos.
capinfos_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@
+capinfos_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link editcap.
editcap_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@
+editcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link randpkt.
randpkt_LDADD = \
@@ -424,6 +438,7 @@ randpkt_LDADD = \
@NSL_LIBS@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@
+randpkt_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries and plugin flags with which to link dftest.
dftest_LDADD = \
@@ -444,6 +459,7 @@ dftest_LDADD = \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
+dftest_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link dumpcap.
dumpcap_LDADD = \
@@ -457,6 +473,7 @@ dumpcap_LDADD = \
@FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
@LIBCAP_LIBS@
+dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \