osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Turn on -Werror for the top level targets, excluding text2pcap (which includes some generated code). 

svn path=/trunk/; revision=26245
This commit is contained in:
Jeff Morriss 2008-09-21 14:59:05 +00:00
parent 4dcba9a359
commit c08a1f420e
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.am
View File

@ -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 \

1
configure.in
View File

@ -19,6 +19,7 @@ AM_DISABLE_STATIC
dnl Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CPP
dnl Work around libtool bug (fixed in the version 1.5a?)
AC_DEFUN([AC_PROVIDE_AC_LIBTOOL_DLOPEN], )