text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46600 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ea558dba6c30d82b43dbce577776f712a7989bd..6a7e2f0ab960f1935d4e06c6b6286d55858a15dd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -884,7 +884,7 @@ endif()
 
 if(BUILD_text2pcap)
        set(text2pcap_LIBS
-               wiretap
+               wsutil
                ${M_LIBRARIES}
                ${ZLIB_LIBRARIES}
        )

diff --git a/Makefile.am b/Makefile.am
index 6438fe5ca48f52275de14b4c8744f272af908fa3..94a4d302cad6420a2843c8e930b2001b800f0aaa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -423,7 +423,6 @@ rawshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
-       wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@ -lm
 # Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c

diff --git a/Makefile.nmake b/Makefile.nmake
index 33c22cad5ac810e0e2cfb02ecde4218ab73a39ee..c76963dfa511d4c67efa083f2d657139d6cab145 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -152,7 +152,7 @@ reordercap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        wsutil\libwsutil.lib \
        $(GLIB_LIBS)
 
-text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+text2pcap_LIBS= \
        wsock32.lib user32.lib \
        wsutil\libwsutil.lib \
        $(GLIB_LIBS)