diff options
| -rw-r--r-- | epan/Makefile.nmake | 8 | ||||
| -rw-r--r-- | filetap/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/asn1/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/ethercat/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/mate/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/profinet/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/wimaxasncp/Makefile.nmake | 2 | ||||
| -rw-r--r-- | wiretap/Makefile.nmake | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 2800ae33af..d9fe15d6ef 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -63,7 +63,7 @@ libwireshark_LIBS = \ $(LUA_LIBS) \ $(SMI_LIBS) \ $(GEOIP_LIBS) \ - ..\wsutil\wsutil.lib \ + ..\wsutil\libwsutil.lib \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ crypt\airpdcap.lib \ ftypes\ftypes.lib \ @@ -265,7 +265,7 @@ TVBTEST_OBJ=tvbtest.obj TVBTEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ - ..\wsutil\wsutil.lib \ + ..\wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK libwireshark.lib \ @@ -293,7 +293,7 @@ OIDS_TEST_OBJ=oids_test.obj OIDS_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ - ..\wsutil\wsutil.lib \ + ..\wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK libwireshark.lib \ @@ -322,7 +322,7 @@ REASSEMBLE_TEST_OBJ=reassemble_test.obj REASSEMBLE_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ - ..\wsutil\wsutil.lib \ + ..\wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK libwireshark.lib \ diff --git a/filetap/Makefile.nmake b/filetap/Makefile.nmake index 58e66d81fe..825db5d26a 100644 --- a/filetap/Makefile.nmake +++ b/filetap/Makefile.nmake @@ -23,7 +23,7 @@ OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) filetap_LIBS = \ $(GLIB_LIBS) \ - ..\wsutil\wsutil.lib \ + ..\wsutil\libwsutil.lib \ $(ZLIB_LIBS) all: filetap-$(FTAP_VERSION).dll diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index 30a055f875..6b8cf60419 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -19,7 +19,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\wsutil.lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=$(CFLAGS) OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake index d465410f19..efcb7da2d1 100644 --- a/plugins/ethercat/Makefile.nmake +++ b/plugins/ethercat/Makefile.nmake @@ -19,7 +19,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\wsutil.lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=$(CFLAGS) OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index 8279281a62..7d301d9694 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -25,7 +25,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(DIRTY_CFLAGS) LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\wsutil.lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=$(CFLAGS) OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake index 962c2aa474..d431fcc680 100644 --- a/plugins/profinet/Makefile.nmake +++ b/plugins/profinet/Makefile.nmake @@ -19,7 +19,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\wsutil.lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=$(CFLAGS) OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake index efc16d163c..8fe22f3b00 100644 --- a/plugins/wimaxasncp/Makefile.nmake +++ b/plugins/wimaxasncp/Makefile.nmake @@ -23,7 +23,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(DIRTY_CFLAGS) LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\wsutil.lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=$(CFLAGS) OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 65a5cd69b4..56b50adb55 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -23,7 +23,7 @@ OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) wiretap_LIBS = \ $(GLIB_LIBS) \ - ..\wsutil\wsutil.lib \ + ..\wsutil\libwsutil.lib \ $(ZLIB_LIBS) all: wiretap-$(WTAP_VERSION).dll |