diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-09 16:23:19 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-09 23:23:47 +0000 |
| commit | c5a50df51f38e10e3a3618d9394364f60a1ca8af (patch) | |
| tree | a3701412f8b17ebdb97de5af86f2603418eacab2 /wsutil | |
| parent | b2bf078d520b8bf8edc25172d768ba102a772ffb (diff) | |
| download | wireshark-c5a50df51f38e10e3a3618d9394364f60a1ca8af.tar.gz wireshark-c5a50df51f38e10e3a3618d9394364f60a1ca8af.tar.bz2 wireshark-c5a50df51f38e10e3a3618d9394364f60a1ca8af.zip | |
See if we can get rid of the "lib" in front of "wsutil" on Windows.
"libXXX" is a UN*X convention; see whether we can do without it on
Windows.
Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85
Reviewed-on: https://code.wireshark.org/review/2968
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 64dbdb3d46..14f94d49a0 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 libwsutil.dll +# For use when making wsutil.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 libwsutil.dll -libwsutil.lib: libwsutil.dll -libwsutil.exp: libwsutil.dll +# For use when making wsutil.dll +wsutil.lib: wsutil.dll +wsutil.exp: wsutil.dll -libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res - @echo Linking libwsutil.dll +wsutil.dll : $(OBJECTS) ..\image\libwsutil.res + @echo Linking wsutil.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:libwsutil.dll \ - /IMPLIB:libwsutil.lib \ + /OUT:wsutil.dll \ + /IMPLIB:wsutil.lib \ ..\image\libwsutil.res \ $(OBJECTS) $(libwsutil_LIBS) @@ -51,10 +51,10 @@ ws_version_info.obj: ..\version.h clean: rm -f $(OBJECTS) \ - libwsutil.lib \ - libwsutil.exp \ - libwsutil.dll \ - libwsutil.dll.manifest \ + wsutil.lib \ + wsutil.exp \ + wsutil.dll \ + wsutil.dll.manifest \ *.pdb *.sbr distclean: clean |