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 /wiretap/Makefile.nmake | |
parent | da2f447a9bda3a05dd8e61b1c1f5dea4b5912f6b (diff) | |
download | wireshark-a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e.tar.gz |
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 'wiretap/Makefile.nmake')
-rw-r--r-- | wiretap/Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index c656c97e86..b3e4c5be19 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -17,7 +17,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL .c.obj:: $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< -OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) file_util.obj +OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) wiretap_LIBS = \ $(GLIB_LIBS) \ @@ -36,7 +36,7 @@ wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res /IMPLIB:wiretap-$(WTAP_VERSION).lib \ ..\image\wiretap.res \ $(OBJECTS) $(wiretap_LIBS) -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" +!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "wiretap-$(WTAP_VERSION).dll.manifest" -outputresource:wiretap-$(WTAP_VERSION).dll;2 !ENDIF |