diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-02-18 20:24:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-02-18 20:24:54 +0000 |
| commit | 67186dfc6e92fc3c39ac292e52737e87fc46e6f6 (patch) | |
| tree | d18413ffb5c6b13916a8c545bb2f4eb17a12df93 | |
| parent | bdab9be8981c325828ba2ad631c82b5af34b9c31 (diff) | |
Rename the (static) library built from stuff in ui/gtk to "libgtkui" in
automake/autoconf and nmake builds, to match the name in CMake builds.
(Forgot Makefile.nmake.)
svn path=/trunk/; revision=41059
| -rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d801b9c4d8..5ab6234349 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -262,10 +262,10 @@ $(RESOURCES): image wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap -wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan gtk win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\gtk\libui.lib ui\win32\libui_win32.lib plugins +wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan gtk win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libui.lib ui\win32\libui_win32.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib $(wireshark_OBJECTS) image\wireshark.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 @@ -691,12 +691,12 @@ codecs:: gtk:: help config.h svnversion.h doxygen cd ui/gtk - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib + $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib cd ../.. win32:: cd ui/win32 - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui_win32.lib + $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib cd ../.. epan:: $(RESOURCES) $(ZLIB_DLL) wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen |