From a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 22 May 2008 15:46:27 +0000 Subject: Move the file utility functions from wiretap to libwsutil so that libwireshark (and the plugins using those functions) do not depend on wiretap on Windows. While doing that, rename the eth_* functions to ws_*. svn path=/trunk/; revision=25354 --- plugins/asn1/Makefile.nmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/asn1/Makefile.nmake') diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index b5e4e84d9b..2902af11b1 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -9,16 +9,16 @@ include moduleinfo.nmake include Makefile.common -CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ +CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) .c.obj:: $(CC) $(CFLAGS) -Fd.\ -c $< - + LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wiretap\wiretap-$(WTAP_VERSION).lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) @@ -93,12 +93,12 @@ plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg clean: rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \ $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc + $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc distclean: clean maintainer-clean: distclean -checkapi: +checkapi: # TODO: Fix api's :) # $(PERL) ../../tools/checkAPIs.pl $(DISSECTOR_SRC) -- cgit v1.2.3