diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-10-15 15:31:20 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-10-15 15:31:20 +0000 |
| commit | 46484ff0f7f271d37f9dbdd0cb95283e55c186ab (patch) | |
| tree | 1171a9d3a5e611d9ea63d116bef96d62532c6f24 | |
| parent | 0a1bbd552642b1ed76a70bacaaf3030acce69d46 (diff) | |
| download | wireshark-46484ff0f7f271d37f9dbdd0cb95283e55c186ab.tar.gz | |
Start making the program name "wireshark" configurable.
svn path=/trunk/; revision=45558
| -rw-r--r-- | Makefile.nmake | 10 | ||||
| -rw-r--r-- | config.nmake | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a8ce6eca96..f149ea2fd1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -296,10 +296,10 @@ wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui gtk win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.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\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_OBJECTS) image\wireshark.res image\file_dlg_win32.res + /OUT:$(PROGRAM_NAME).exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_OBJECTS) image\wireshark.res image\file_dlg_win32.res << !IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 + mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:$(PROGRAM_NAME).exe;1 !ENDIF tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins @@ -1046,9 +1046,9 @@ install-generated-files: xcopy ".\wsutil\libwsutil.dll" $(INSTALL_DIR) /d if exist ".\wsutil\libwsutil.lib" xcopy ".\wsutil\libwsutil.lib" $(INSTALL_DIR) /d if exist ".\wsutil\libwsutil.pdb" xcopy ".\wsutil\libwsutil.pdb" $(INSTALL_DIR) /d - if exist wireshark.exe xcopy wireshark.exe $(INSTALL_DIR) /d - if exist wireshark.pdb xcopy wireshark.pdb $(INSTALL_DIR) /d - if exist wireshark.bsc xcopy wireshark.bsc $(INSTALL_DIR) /d + if exist $(PROGRAM_NAME).exe xcopy $(PROGRAM_NAME).exe $(INSTALL_DIR) /d + if exist $(PROGRAM_NAME).pdb xcopy $(PROGRAM_NAME).pdb $(INSTALL_DIR) /d + if exist $(PROGRAM_NAME).bsc xcopy $(PROGRAM_NAME).bsc $(INSTALL_DIR) /d if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d diff --git a/config.nmake b/config.nmake index e3443edfe6..0cb6cc74ab 100644 --- a/config.nmake +++ b/config.nmake @@ -3,6 +3,10 @@ # Some more information about the settings in this file can be found in # the file README.windows and the Developer's Guide (available online). +##### Program name ##### +# Do not change as it will break the installer and possibly other stuff +PROGRAM_NAME=wireshark + ##### Target platform ##### # Only "win32" and "win64" are valid (for now). # This can be defined in the system environment. @@ -40,7 +44,7 @@ WTAP_VERSION_MICRO=0 # This can be defined in the system environment. # !IFNDEF WIRESHARK_LIB_DIR -WIRESHARK_LIB_DIR=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs +WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs !ENDIF # |