From 0461a705c0a6e4fb35b8dac32abd81ac98c32879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=BCxen?= <tuexen@fh-muenster.de>
Date: Tue, 18 Dec 2012 22:56:06 +0000
Subject: [PATCH] text2pcap needs only the wsutil lib, not the wiretap lib (as
 far as I can see).

svn path=/trunk/; revision=46600
---
 CMakeLists.txt | 2 +-
 Makefile.am    | 1 -
 Makefile.nmake | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ea558dba6..6a7e2f0ab9 100644
--- 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 6438fe5ca4..94a4d302ca 100644
--- 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 33c22cad5a..c76963dfa5 100644
--- 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)