osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Part of "Build Browse Information File per default" from 

Kovarththanan Rajaratnam applied.

It's still not the default but easier to make it so.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480

svn path=/trunk/; revision=40765
This commit is contained in:
Anders Broman 2012-01-29 21:56:35 +00:00
parent 00c0b9df7c
commit 087e6087f0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.nmake
View File

@ -236,11 +236,12 @@ packaging_zip: all
zip -r -9 wireshark.zip $(INSTALL_DIR)/
wireshark.bsc: *.sbr epan\*.sbr epan\dfilter\*.sbr epan\ftypes\*.sbr epan\wslua\*.sbr epan\dissectors\*.sbr ui\gtk\*.sbr win32\*.sbr wiretap\*.sbr
# FIXME: Add epan/wspython/*.sbr when we support Python embedding
# wireshark.bsc: *.sbr codecs/*.sbr epan/*.sbr epan/crypt/*.sbr epan/dfilter/*.sbr epan/dissectors/*.sbr epan/ftypes/*.sbr epan/wslua/*.sbr ui/gtk/*.sbr plugins/asn1/*.sbr plugins/docsis/*.sbr plugins/ethercat/*.sbr plugins/giop/*.sbr plugins/gryphon/*.sbr plugins/irda/*.sbr plugins/m2m/*.sbr plugins/mate/*.sbr plugins/opcua/*.sbr plugins/profinet/*.sbr plugins/stats_tree/*.sbr plugins/unistim/*.sbr plugins/wimax/*.sbr plugins/wimaxasncp/*.sbr tools/lemon/*.sbr wiretap/*.sbr wsutil/*.sbr
rm -f $@
$(BSCMAKE) @<<
/o $@ $?
<<
xcopy $@ $(INSTALL_DIR)\ /d
pdb_zip: all
cd $(INSTALL_DIR)
@ -467,7 +468,7 @@ text2pcap.obj mergecap.obj capinfos.obj editcap.obj version_info.obj: svnversion
clean-local:
rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \
$(EXECUTABLES) *.pdb *.exe.manifest \
$(EXECUTABLES) *.pdb *.sbr *.exe.manifest \
capinfos.obj editcap.obj mergecap.obj text2pcap.obj \
nio-ie5.obj update.obj \
text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
@ -969,6 +970,7 @@ install-generated-files:
if exist ".\wsutil\libwsutil.pdb" xcopy ".\wsutil\libwsutil.pdb" $(INSTALL_DIR) /d
if exist wireshark.exe copy wireshark.exe $(INSTALL_DIR)\wireshark.exe
if exist wireshark.pdb copy wireshark.pdb $(INSTALL_DIR)\wireshark.pdb
if exist wireshark.bsc copy wireshark.bsc $(INSTALL_DIR)\wireshark.bsc
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

2
config.nmake
View File

@ -704,6 +704,8 @@ MANIFEST_INFO_REQUIRED=1
# Compiler flags:
# /W3 Warning level 3 (0 less - 4 most, 1 default)
# /Zi Create .pdb file for debugging
# /FR Create .sbr file with complete symbolic information
# add to local flags if you want to build the .sbr files.
# /MD Use "multithread- and DLL-specific version" of run-time libraries
# msvc documentation states that /MD causes _MT and _DLL to be defined
# See: http://msdn.microsoft.com/en-us/library/2kzt1wy3%28v=VS.90%29.aspx