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

Remove a couple more references to the optional objects (that are now in wsutil) 

svn path=/trunk/; revision=33015
This commit is contained in:
Jeff Morriss 2010-05-29 00:34:08 +00:00
parent ccd0726178
commit 79c2dae960
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/CMakeLists.txt
View File

@ -1223,9 +1223,6 @@ add_lemon_files(LIBWIRESHARK_FILES
set(epan_LIBS
wiretap
wsutil
# @INET_ATON_LO@
# @INET_PTON_LO@
# @INET_NTOP_LO@
# @SSL_LIBS@
${PCRE_LIBRARIES}
${GLIB2_LIBRARIES}

4
epan/Makefile.am
View File

@ -129,7 +129,7 @@ MAINTAINERCLEANFILES = \
# Add the object files for missing routines, if any.
#
libwireshark_la_LIBADD = \
@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
libwireshark_generated.la \
libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
@ -139,7 +139,7 @@ libwireshark_la_LIBADD = \
${top_builddir}/wsutil/libwsutil.la -lm
libwireshark_la_DEPENDENCIES = \
@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
libwireshark_generated.la \
libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) \