osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Since code generated by lex may trigger gcc warnings, we are now generating two 

libraries. A single library is generated with the lex code without the barrier
"stop on warning". Another library is generated from the remaining source
files with the "stop on warning" barrier.


svn path=/trunk/; revision=21813
This commit is contained in:
Sebastien Tandel 2007-05-17 17:08:11 +00:00
parent 21e897760f
commit dd7753ab2c
3 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
epan/Makefile.am
View File

@ -39,6 +39,7 @@ DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
ACLOCAL_AMFLAGS = `../aclocal-flags`
noinst_LTLIBRARIES = libwireshark_generated.la
lib_LTLIBRARIES = libwireshark.la
libwireshark_la_LDFLAGS = -version-info 0:1:0 @LDFLAGS_SHAREDLIB@
@ -47,9 +48,22 @@ include Makefile.common
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) @LUA_INCLUDES@ \
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS = -Werror
endif
#Since code generated by lex may trigger gcc warnings, we are now generating two
#libraries. A single library is generated with the lex code without the barrier
#"stop on warning". An other library is generated from the remaining source
#files with the "stop on warning" barrier.
libwireshark_la_SOURCES = \
$(LIBWIRESHARK_SRC) \
$(LIBWIRESHARK_INCLUDES)
libwireshark_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS)
libwireshark_generated_la_SOURCES = \
$(LIBWIRESHARK_GENERATED_SRC)
EXTRA_libwireshark_la_SOURCES = \
g_ascii_strtoull.c \
@ -61,33 +75,31 @@ EXTRA_libwireshark_la_SOURCES = \
inet_v6defs.h
EXTRA_DIST = \
dtd_grammar.lemon \
dtd_parse.l \
dtd_preparse.l \
enterprise-numbers \
dtd_grammar.lemon \
dtd_parse.l \
dtd_preparse.l \
enterprise-numbers \
libwireshark.def \
Makefile.common \
Makefile.nmake \
make-sminmpec.pl \
radius_dict.l \
tvbtest.c \
reassemble_test.c \
uat_load.l \
exntest.c \
Makefile.common \
Makefile.nmake \
make-sminmpec.pl \
radius_dict.l \
tvbtest.c \
reassemble_test.c \
uat_load.l \
exntest.c \
doxygen.cfg.in
CLEANFILES = \
libwireshark.a \
libwireshark.la \
libwireshark.a \
libwireshark.la \
libwireshark_generated.a \
libwireshark_generated.la \
*~
DISTCLEANFILES = \
dtd_grammar.out \
dtd_grammar.c \
dtd_grammar.h \
dtd_parse.c \
dtd_preparse.c \
radius_dict.c
$(LIBWIRESHARK_GENERATED_SRC) \
dtd_grammar.out
MAINTAINERCLEANFILES = \
@ -98,8 +110,8 @@ MAINTAINERCLEANFILES = \
#
# Add the object files for missing routines, if any.
#
libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
#EXTRA_PROGRAMS = reassemble_test
#reassemble_test_LDADD = $(GLIB_LIBS)

30
epan/Makefile.common
View File

@ -41,9 +41,6 @@ LIBWIRESHARK_SRC = \
crc16.c \
crc32.c \
crcdrm.c \
dtd_grammar.c \
dtd_parse.c \
dtd_preparse.c \
emem.c \
epan.c \
ex-opt.c \
@ -52,9 +49,9 @@ LIBWIRESHARK_SRC = \
filesystem.c \
follow.c \
frame_data.c \
funnel.c \
gcp.c \
guid-utils.c \
funnel.c \
gcp.c \
guid-utils.c \
h225-persistentdata.c \
in_cksum.c \
ipproto.c \
@ -68,7 +65,6 @@ LIBWIRESHARK_SRC = \
prefs.c \
privileges.c \
proto.c \
radius_dict.c \
range.c \
reassemble.c \
reedsolomon.c \
@ -90,13 +86,24 @@ LIBWIRESHARK_SRC = \
tvbparse.c \
tvbuff.c \
uat.c \
uat_load.c \
uat_load.c \
unicode-utils.c \
value_string.c \
ws_strsplit.c \
xdlc.c \
xmlstub.c
LIBWIRESHARK_GENERATED_SRC = \
dtd_grammar.c \
dtd_parse.c \
dtd_preparse.c \
radius_dict.c
LIBWIRESHARK_ALL_SRC = \
$(LIBWIRESHARK_SRC) \
$(LIBWIRESHARK_GENERATED_SRC)
LIBWIRESHARK_INCLUDES = \
addr_and_mask.h \
addr_resolv.h \
@ -123,8 +130,7 @@ LIBWIRESHARK_INCLUDES = \
crc32.h \
crcdrm.h \
dtd.h \
dtd_grammar.h \
dtd_parse.h \
dtd_grammar.h \
emem.h \
epan.h \
epan_dissect.h \
@ -192,8 +198,8 @@ LIBWIRESHARK_INCLUDES = \
to_str.h \
tvbparse.h \
tvbuff.h \
uat.h \
uat-int.h \
uat.h \
uat-int.h \
unicode-utils.h \
value_string.h \
ws_strsplit.h \

2
epan/Makefile.nmake
View File

@ -48,7 +48,7 @@ libwireshark_LIBS = \
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
LIBWIRESHARK_OBJECTS = $(LIBWIRESHARK_SRC:.c=.obj)
LIBWIRESHARK_OBJECTS = $(LIBWIRESHARK_ALL_SRC:.c=.obj)
EXTRA_OBJECTS = \
# strerror.obj \