diff options
| author | Gerald Combs <gerald@zing.org> | 2014-09-13 10:20:38 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-13 19:30:10 +0000 |
| commit | f0982e26a131a5f494a40a96c7d04796efe69ad3 (patch) | |
| tree | df01ae5c4f88d48996f1421c81f9c5ee5f5c7666 | |
| parent | 283861892ca7a93c184355e6236a026516410cf9 (diff) | |
| download | wireshark-f0982e26a131a5f494a40a96c7d04796efe69ad3.tar.gz | |
GTK+: Make sure we package up Wireshark-gtk.pdb.
Make sure we use $(PROGRAM_NAME_GTK) consistently. We still need to add
the Qt UI .pdb to the archive but I'm not in front of a proper Windows
development environment right now.
Change-Id: Ie917f68e3e8349fc7955b3b7e68d446b6fe88235
Reviewed-on: https://code.wireshark.org/review/4096
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4d28ec86f9..d7b8f02a82 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -206,7 +206,7 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) -EXECUTABLES=wireshark-gtk.exe tshark.exe tfshark.exe rawshark.exe \ +EXECUTABLES=$(PROGRAM_NAME_GTK).exe tshark.exe tfshark.exe rawshark.exe \ capinfos.exe captype.exe editcap.exe mergecap.exe text2pcap.exe \ randpkt.exe reordercap.exe dumpcap.exe dftest.exe @@ -1161,7 +1161,7 @@ clean_setup: # prepare debugging of Wireshark in INSTALL_DIR -debug-wireshark: wireshark-gtk.exe install-generated-files +debug-wireshark: $(PROGRAM_NAME_GTK).exe install-generated-files # prepare debugging of tshark in INSTALL_DIR debug-tshark: tshark.exe install-generated-files @@ -1194,9 +1194,9 @@ install-generated-files: doc 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 $(PROGRAM_NAME)-gtk.exe xcopy $(PROGRAM_NAME)-gtk.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 $(PROGRAM_NAME_GTK).exe xcopy $(PROGRAM_NAME_GTK).exe $(INSTALL_DIR) /d + if exist $(PROGRAM_NAME_GTK).pdb xcopy $(PROGRAM_NAME_GTK).pdb $(INSTALL_DIR) /d + if exist $(PROGRAM_NAME_GTK).bsc xcopy $(PROGRAM_NAME_GTK).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 |