diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-05-22 15:46:27 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-05-22 15:46:27 +0000 |
| commit | a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e (patch) | |
| tree | 65a7d5c702bf3392494b33ddd7ed43c94e491670 /plugins/mate/Makefile.nmake | |
| parent | da2f447a9bda3a05dd8e61b1c1f5dea4b5912f6b (diff) | |
| download | wireshark-a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e.tar.gz wireshark-a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e.tar.bz2 wireshark-a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e.zip | |
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
Diffstat (limited to 'plugins/mate/Makefile.nmake')
| -rw-r--r-- | plugins/mate/Makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index d350bef09e..ef8aee90d4 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -13,7 +13,7 @@ include Makefile.common LEMON=..\..\tools\lemon -CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) /I$(LEMON)\ +CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) /I$(LEMON)\ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) .c.obj:: @@ -22,7 +22,7 @@ CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) /I$(LEMON)\ 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) @@ -97,7 +97,7 @@ 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 # We remove the generated files with "distclean" because one of them, # "mate_parser.c", needs different #includes for UN*X and Windows @@ -120,12 +120,12 @@ mate_parser.obj : mate_parser.c mate_grammar.h : mate_grammar.c mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe - $(LEMON)\lemon.exe t=$(LEMON)\lempar.c mate_grammar.lemon + $(LEMON)\lemon.exe t=$(LEMON)\lempar.c mate_grammar.lemon $(LEMON)\lemon.exe: cd ../../tools/lemon $(MAKE) /$(MAKEFLAGS) -f makefile.nmake cd ../../plugins/mate -checkapi: +checkapi: $(PERL) ../../tools/checkAPIs.pl $(DISSECTOR_SRC) |