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/giop | |
| 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/giop')
| -rw-r--r-- | plugins/giop/Makefile.nmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index cdbfd8e7ac..16ef412e52 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -6,7 +6,7 @@ include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ +CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) @@ -15,9 +15,9 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) -OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj packet-tango.obj packet-parlay.obj +OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj packet-tango.obj packet-parlay.obj -all : cosnaming.dll coseventcomm.dll tango.dll parlay.dll +all : cosnaming.dll coseventcomm.dll tango.dll parlay.dll cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj $(LINK_PLUGIN_WITH) link -dll /out:cosnaming.dll $(LDFLAGS) packet-cosnaming.obj $(LINK_PLUGIN_WITH) \ @@ -44,16 +44,16 @@ clean: parlay.dll parlay.exp parlay.lib *.pdb \ cosnaming.dll.manifest coseventcomm.dll.manifest \ parlay.dll.manifest tango.dll.manifest - + distclean: clean maintainer-clean: distclean -checkapi: +checkapi: $(PERL) ../../tools/checkAPIs.pl \ packet-cosnaming.c \ packet-coseventcomm.c \ packet-tango.c \ - packet-parlay.c + packet-parlay.c |