diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-10 00:59:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-10 00:59:31 +0000 |
| commit | 9b182b7097e339501977f595903c2e837055fb1d (patch) | |
| tree | b83f992929b3047baade15ca55f420f93567a5dd /wsutil | |
| parent | ea721b8938d4dcc9ab8277c3508e7981838b4a0f (diff) | |
| download | wireshark-9b182b7097e339501977f595903c2e837055fb1d.tar.gz wireshark-9b182b7097e339501977f595903c2e837055fb1d.tar.bz2 wireshark-9b182b7097e339501977f595903c2e837055fb1d.zip | |
Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."
This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af.
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: I6ead152fc308480d02266b0f3f0caaa873caf6d2
Reviewed-on: https://code.wireshark.org/review/2973
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.nmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 14f94d49a0..64dbdb3d46 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -17,7 +17,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ .c.obj:: $(CC) $(CFLAGS) -Fd.\ -c $< -# For use when making wsutil.dll +# For use when making libwsutil.dll libwsutil_LIBS = $(GLIB_LIBS) \ $(GNUTLS_LIBS) @@ -30,16 +30,16 @@ OBJECTS = file_util.obj \ wsgetopt.obj \ ws_mempbrk_sse42.obj -# For use when making wsutil.dll -wsutil.lib: wsutil.dll -wsutil.exp: wsutil.dll +# For use when making libwsutil.dll +libwsutil.lib: libwsutil.dll +libwsutil.exp: libwsutil.dll -wsutil.dll : $(OBJECTS) ..\image\libwsutil.res - @echo Linking wsutil.dll +libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res + @echo Linking libwsutil.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:wsutil.dll \ - /IMPLIB:wsutil.lib \ + /OUT:libwsutil.dll \ + /IMPLIB:libwsutil.lib \ ..\image\libwsutil.res \ $(OBJECTS) $(libwsutil_LIBS) @@ -51,10 +51,10 @@ ws_version_info.obj: ..\version.h clean: rm -f $(OBJECTS) \ - wsutil.lib \ - wsutil.exp \ - wsutil.dll \ - wsutil.dll.manifest \ + libwsutil.lib \ + libwsutil.exp \ + libwsutil.dll \ + libwsutil.dll.manifest \ *.pdb *.sbr distclean: clean |