diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-10 00:59:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-10 00:59:07 +0000 |
| commit | ea721b8938d4dcc9ab8277c3508e7981838b4a0f (patch) | |
| tree | a3701412f8b17ebdb97de5af86f2603418eacab2 /plugins | |
| parent | b1c9d0fafe4f6edbbb504e87d7b6c378e84edc0f (diff) | |
Revert "More needed to get rid of "lib" in "libwsutil" on Windows."
This reverts commit 28719a4e4e01b478889dab9611fed517e506360e.
Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.
Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a
Reviewed-on: https://code.wireshark.org/review/2972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins')
| -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 |
5 files changed, 5 insertions, 5 deletions
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 |