git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Regenerate GIOP dissector plugins (after change in generator !) with following commma...
[obnox/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index d9ba2b21e52df2b67f8ea390ed1b630e99da02fe..4b5ad1f165dab718f53b9359a6927426b4b24376 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -29,7 +29,7 @@ WIN_SETUP=tools/$(WIRESHARK_TARGET_PLATFORM)-setup.sh
 #      as to the required library package files will be made.
 #
 LIBS_CHECK=_libs_check_
-!IF [$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIBS)"] != 0
+!IF [$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIB_DIR)"] != 0
 CHECK_TAG=_check_tag_
 !ELSE
 CHECK_TAG=
@@ -95,6 +95,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib \
        $(GLIB_LIBS) \
+       $(GTHREAD_LIBS) \
        wsutil\libwsutil.lib \
        $(GNUTLS_LIBS) \
        $(PYTHON_LIBS) \
@@ -244,7 +245,7 @@ wireshark.bsc: *.sbr epan\*.sbr epan\dfilter\*.sbr epan\ftypes\*.sbr epan\wslua\
 pdb_zip: all
        cd $(INSTALL_DIR)
        rm -f ../wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip
-       zip -9 ../wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip *.pdb
+       zip -9 ../wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip *.pdb *.lib
        cd ..
 
 $(RESOURCES): image
@@ -382,10 +383,10 @@ config.h  : config.h.win32 config.nmake
            -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \
            -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \
            -e "s/@HAVE_GEOIP@/$(GEOIP_CONFIG)/" \
+           -e "s/@HAVE_GEOIP_V6@/$(GEOIP_V6_CONFIG)/" \
            -e "s/@INET6@/$(INET6_CONFIG)/" \
            -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \
            -e "s/@PCAP_NG_DEFAULT@/$(PCAP_NG_DEFAULT)/" \
-           -e "s/@MAIN_MENU_USE_UIMANAGER@/$(MAIN_MENU_USE_UIMANAGER)/" \
            -e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \
            < config.h.win32 > $@
 
@@ -395,7 +396,9 @@ ps.c: tools\rdps.py print.ps
 #
 # Build the version string
 #
-!IF EXIST(".svn/entries")
+!IF EXIST(".svn/wc.db")
+SVNENTRIES = .svn/wc.db
+!ELSE IF EXIST(".svn/entries")
 SVNENTRIES = .svn/entries
 !ELSE
 SVNENTRIES =
@@ -474,6 +477,8 @@ clean: clean-local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../doc
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ../docbook
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../help
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../packaging/nsis
@@ -497,7 +502,7 @@ distclean-local: clean-local
                $(ZLIB_DIR)\include\zlib.h $(ZLIB_DIR)\include\zconf.h \
                $(ZLIB_DIR)\lib\zdll.lib
 !ENDIF
-       rm -f config.h $(BUILT_SOURCES)
+       rm -f config.h $(BUILT_SOURCES) wireshark-pdb*.zip
 
 distclean: distclean-local
        cd wiretap
@@ -520,6 +525,8 @@ distclean: distclean-local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../doc
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       cd ../docbook
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../help
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../packaging/nsis
@@ -557,6 +564,8 @@ maintainer-clean: maintainer-clean-local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ../doc
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../docbook
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ../help
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ../packaging/nsis
@@ -589,7 +598,7 @@ image::
 #
 $(ADNS_DLL):
 !IF "$(MSVC_VARIANT)" == "MSVC6"
-       if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns
+       if not exist $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns
        copy $(ADNS_DIR)\adns_win32\lib\adns_dll.dll $(ADNS_DLL)
        copy $(ADNS_DIR)\adns_win32\lib\adns_dll.lib $(ADNS_LIBS)
 !ELSE
@@ -603,7 +612,7 @@ $(ADNS_DLL):
 !IFDEF MANIFEST_INFO_REQUIRED
        mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2
 !ENDIF
-       if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns
+       if not exist $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns
        copy adns_dll.dll $(ADNS_DLL)
        copy adns_dll.lib $(ADNS_LIBS)
        cd ..\..\..
@@ -678,6 +687,11 @@ doc::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
 
+docbook::
+       cd docbook
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+       cd ..
+
 help::
        cd help
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -711,14 +725,14 @@ REQUIRED_TOOLS=\
        $(LINK) \
        nmake \
 !IFDEF MANIFEST_INFO_REQUIRED
-       mt \
+       --windowsonly mt        \
 !ENDIF
        $(SH_PROG)      \
        $(YACC) \
        $(LEX)  \
        env     \
        grep    \
-       /usr/bin/find   \
+       --cygwinonly /usr/bin/find      \
        $(PERL) \
        $(PYTHON)       \
        sed     \
@@ -727,7 +741,7 @@ REQUIRED_TOOLS=\
 
 verify_tools:
 # As win-setup.sh assumes the dir exists create it if it doesn't
-       @if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
+       @if not exist $(WIRESHARK_LIB_DIR) md $(WIRESHARK_LIB_DIR)
        @$(SH) $(WIN_SETUP) --appverify $(REQUIRED_TOOLS)
 
 # Targets and etc used to verify or download libraries
@@ -765,7 +779,7 @@ $(CHECK_TAG): _FORCE_
 
 !ENDIF
 
-# Download (if needed) and install all the required libraries into WIRESHARK_LIBS.
+# Download (if needed) and install all the required libraries into WIRESHARK_LIB_DIR.
 # A clean_setup is done first to ensure that the target dirs don't
 # contain old files remaining from a previous setup run.
 setup: verify_tools clean_setup process_libs
@@ -774,35 +788,35 @@ setup: verify_tools clean_setup process_libs
 # The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
 # (The choice is determined by the value of the macro WIN_SETUP_OPT).
 process_libs:
-    @if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
+    @if not exist $(WIRESHARK_LIB_DIR) md $(WIRESHARK_LIB_DIR)
 !IFDEF GTK_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
 !ENDIF
 !IFDEF KFW_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . kfw-3-2-2-i386-ws-vc6.zip
-#      @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+#      @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 #              . kfw-3-2-2.zip
 !ENDIF
 !IFDEF PCAP_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . WpdPack_$(PCAP_VERSION).zip
 !ENDIF
 !IFDEF AIRPCAP_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                AirPcap_Devpack_4_1_0_1622 AirPcap_Devpack_4_1_0_1622.zip
 !ENDIF
 !IFDEF C_ARES_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF ADNS_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . adns-1.0-win32-05ws.zip
 !ENDIF
 !IFDEF ZLIB_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
                zlib125 zlib-1.2.5.zip
 !else
@@ -810,40 +824,40 @@ process_libs:
 !endif
 !ENDIF
 !IFDEF LUA_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                lua5.1.4 lua$(LUA_DIST)_lib.zip
 !ENDIF
 
 !IFDEF GNUTLS_PKG
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF PORTAUDIO_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . portaudio_v19_2.zip
 !ENDIF
 !IFDEF SMI_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF GEOIP_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . GeoIP-1.4.6-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF HHC_DIR
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                user-guide user-guide-37310.zip
 !ENDIF
 !IFDEF UPX
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . upx303w.zip
 !ENDIF
 !IFDEF NASM
-       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+       @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . nasm-2.09.08-win32.zip
 !ENDIF
 !IF "$(WIN_SETUP_OPT)" == "--download"
-       @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIBS)"
+       @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)"
 !ENDIF
        @echo.
        @echo Wireshark is ready to build.
@@ -853,7 +867,7 @@ process_libs:
 # WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO
 # UPDATING REMOVES THE FORMER USER DIRS
 clean_setup:
-    cd $(WIRESHARK_LIBS)
+    cd $(WIRESHARK_LIB_DIR)
     rm -r -f adns-1.0-win32-05ws
     rm -r -f c-ares-1.5.3ws
     rm -r -f c-ares-1.6.0ws
@@ -927,28 +941,32 @@ install-generated-files:
 !ENDIF
 !IFDEF ENABLE_LIBWIRESHARK
        xcopy epan\libwireshark.dll $(INSTALL_DIR) /d
+       if exist epan\libwireshark.lib xcopy .\epan\libwireshark.lib $(INSTALL_DIR) /d
        if exist epan\libwireshark.pdb xcopy .\epan\libwireshark.pdb $(INSTALL_DIR) /d
 !ENDIF
        xcopy ".\wiretap\wiretap-$(WTAP_VERSION).dll" $(INSTALL_DIR) /d
+       if exist ".\wiretap\wiretap-$(WTAP_VERSION).lib" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).lib" $(INSTALL_DIR) /d
        if exist ".\wiretap\wiretap-$(WTAP_VERSION).pdb" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).pdb" $(INSTALL_DIR) /d
        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 copy wireshark.exe $(INSTALL_DIR)\wireshark.exe
        if exist wireshark.pdb copy wireshark.pdb $(INSTALL_DIR)\wireshark.pdb
        if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d
-       if exist tshark.exe xcopy tshark.exe $(INSTALL_DIR) /d
-       if exist tshark.pdb xcopy tshark.pdb $(INSTALL_DIR) /d
-       if exist rawshark.exe xcopy rawshark.exe $(INSTALL_DIR) /d
-       if exist rawshark.pdb xcopy rawshark.pdb $(INSTALL_DIR) /d
+       if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d
+       if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d
        if exist dumpcap.exe xcopy dumpcap.exe $(INSTALL_DIR) /d
        if exist dumpcap.pdb xcopy dumpcap.pdb $(INSTALL_DIR) /d
+       if exist editcap.exe xcopy editcap.exe $(INSTALL_DIR) /d
+       if exist editcap.pdb xcopy editcap.pdb $(INSTALL_DIR) /d
        if exist mergecap.exe xcopy mergecap.exe $(INSTALL_DIR) /d
        if exist mergecap.pdb xcopy mergecap.pdb $(INSTALL_DIR) /d
+       if exist rawshark.exe xcopy rawshark.exe $(INSTALL_DIR) /d
+       if exist rawshark.pdb xcopy rawshark.pdb $(INSTALL_DIR) /d
        if exist text2pcap.exe xcopy text2pcap.exe $(INSTALL_DIR) /d
        if exist text2pcap.pdb xcopy text2pcap.pdb $(INSTALL_DIR) /d
-       if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d
-       if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d
-       if exist editcap.exe xcopy editcap.exe $(INSTALL_DIR) /d
-       if exist editcap.pdb xcopy editcap.pdb $(INSTALL_DIR) /d
+       if exist tshark.exe xcopy tshark.exe $(INSTALL_DIR) /d
+       if exist tshark.pdb xcopy tshark.pdb $(INSTALL_DIR) /d
        xcopy "doc\AUTHORS-SHORT" $(INSTALL_DIR) /d
        xcopy ".\manuf" $(INSTALL_DIR) /d
        xcopy ".\services" $(INSTALL_DIR) /d
@@ -996,6 +1014,8 @@ install-generated-files:
        cd plugins
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
        cd ..
+       if not exist $(INSTALL_DIR)\ui mkdir $(INSTALL_DIR)\ui
+       xcopy "gtk\ui\*.xml" $(INSTALL_DIR)\ui /d
 
 # "install-all" will copy all files needed to run Wireshark/Tshark
 # to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there.
git mirror of the wireshark svn