White space changes.

[obnox/wireshark/wip.git] / Makefile.nmake

diff --git a/Makefile.nmake b/Makefile.nmake
index 2be1bc9aace76ccbba4d0ebb3a54d4f240cfb39f..d801b9c4d84f97123b562fb607437dec17065eda 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -36,7 +36,7 @@ CHECK_TAG=
 !ENDIF
 # -------------
 
-LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS)
+LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS)
 
 # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
 GENERATED_CFLAGS=\
@@ -189,7 +189,7 @@ RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \
        image\rawshark.res image\libwsutil.res
 
 
-all: $(LIBS_CHECK) config.h tools image codecs $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil wiretap epan $(EXECUTABLES) $(RESOURCES) doc help install-all
+all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image codecs $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil wiretap epan $(EXECUTABLES) wireshark.bsc $(RESOURCES) doc help install-all
 
 !IFDEF MAKENSIS
 packaging: all
@@ -235,12 +235,22 @@ packaging_zip: all
        rm -f wireshark.zip
        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
-       rm -f $@
+!IFDEF WIRESHARK_GENERATE_BSC_FILE
+# FIXME: Add epan\wspython\*.sbr when we support Python embedding
+# Note: Certain .sbr files which cause bscmake warning "too many references... ignoring ..."
+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 \
+               wiretap\*.sbr wsutil\*.sbr
        $(BSCMAKE) @<<
                /o $@ $?
 <<
-       xcopy $@ $(INSTALL_DIR)\ /d
+!ELSE
+wireshark.bsc:
+!ENDIF
 
 pdb_zip: all
        cd $(INSTALL_DIR)
@@ -390,17 +400,31 @@ config.h  : config.h.win32 config.nmake
            -e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \
            < config.h.win32 > $@
 
-ui\qt\config.pri: config.nmake
+ui\qt\config.pri: config.nmake Makefile.nmake
        @echo Creating <<ui\qt\config.pri
+# Automatically generated from Makefile.nmake. Edit there, not here.
 VERSION = $(VERSION)
-WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR)
-GLIB_DIR = $(GTK_DIR)
-C_ARES_DIR = $(C_ARES_DIR)
-ZLIB_DIR = $(ZLIB_DIR)
-GNUTLS_DIR = $(GNUTLS_DIR)
-SMI_DIR = $(SMI_DIR)
-KFW_DIR = $(KFW_DIR)
-LUA_DIR = $(LUA_DIR)
+!IFDEF MANIFEST_INFO_REQUIRED
+CONFIG += wireshark_manifest_info_required
+!ENDIF
+WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR:\=/)
+GLIB_DIR = $(GTK_DIR:\=/)
+C_ARES_DIR = $(C_ARES_DIR:\=/)
+ZLIB_DIR = $(ZLIB_DIR:\=/)
+GNUTLS_DIR = $(GNUTLS_DIR:\=/)
+SMI_DIR = $(SMI_DIR:\=/)
+KFW_DIR = $(KFW_DIR:\=/)
+LUA_DIR = $(LUA_DIR:\=/)
+PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/)
+
+MSVC_VARIANT = $(MSVC_VARIANT)
+
+QMAKE_CFLAGS         *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
+QMAKE_CXXFLAGS       *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
+QMAKE_LFLAGS         *= /LARGEADDRESSAWARE $(LDFLAGS)
+
+DEFINES += _NEED_VAR_IMPORT_
+
 <<KEEP
 
 ps.c: tools\rdps.py print.ps
@@ -454,7 +478,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 \
@@ -956,6 +980,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