opa: Add dissectors for Intel’s Omni-Path Architecture (OPA)

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

diff --git a/Makefile.nmake b/Makefile.nmake
index 9cc31a058680656c3b5607bc52658eed31e76634..5c8359bf212b8880e992da728443cd4485db237f 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -416,7 +416,7 @@ reordercap.exe      : $(LIBS_CHECK)  config.h $(reordercap_OBJECTS) wsutil\libwsutil.
 text2pcap.exe  : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj writecap wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res
        @echo Linking $@
        $(LINK) @<<
-               /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj $(text2pcap_LIBS) image\text2pcap.res
+               /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj wsutil\ws_version_info.obj $(text2pcap_LIBS) image\text2pcap.res
 <<
 !IFDEF MANIFEST_INFO_REQUIRED
        mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1
@@ -819,7 +819,7 @@ randpkt_core:: help config.h version.h doxygen
        $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake librandpkt_core.lib
        cd ..
 
-extcap::
+extcap:: writecap
        cd extcap
        $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake all
        cd ..
@@ -1077,8 +1077,8 @@ process_libs:
 !ENDIF
 !IFDEF LIBSSH_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-               libssh-$(LIBSSH_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws \
-               libssh-$(LIBSSH_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \
+               . \
+               libssh-0.7.2-$(WIRESHARK_TARGET_PLATFORM)ws.zip \
                "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF WINSPARKLE_DIR
@@ -1126,6 +1126,7 @@ clean_setup:
        rm -r -f c-ares-1.7.0-win??ws
        rm -r -f c-ares-1.7.1-win??ws
        rm -r -f c-ares-1.9.1-1-win??ws
+       rm -r -f c-ares-1.11.0-win??ws
        rm -r -f gettext-0.14.5
        rm -r -f gettext-runtime-0.17
        rm -r -f gettext-runtime-0.17-1
@@ -1155,6 +1156,7 @@ clean_setup:
        rm -r -f libsmi-0.4.5
        rm -r -f libsmi-0.4.8
        rm -r -f libsmi-svn-40773-win??ws
+       rm -r -f libssh-0.7.2-win??ws
        rm -r -f nasm-2.00
        rm -r -f nasm-2.02
        rm -r -f nasm-2.09.08
@@ -1234,6 +1236,8 @@ install-generated-files: doc
        if exist ".\extcap\randpktdump.pdb" xcopy ".\extcap\randpktdump.pdb" $(INSTALL_DIR)\extcap /d
        if exist ".\extcap\sshdump.exe" xcopy ".\extcap\sshdump.exe" $(INSTALL_DIR)\extcap /d
        if exist ".\extcap\sshdump.pdb" xcopy ".\extcap\sshdump.pdb" $(INSTALL_DIR)\extcap /d
+       if exist ".\extcap\ciscodump.exe" xcopy ".\extcap\ciscodump.exe" $(INSTALL_DIR)\extcap /d
+       if exist ".\extcap\ciscodump.pdb" xcopy ".\extcap\ciscodump.pdb" $(INSTALL_DIR)\extcap /d
        if not exist $(INSTALL_DIR_QT)\extcap mkdir $(INSTALL_DIR_QT)\extcap
        if exist ".\extcap\androiddump.exe" xcopy ".\extcap\androiddump.exe" $(INSTALL_DIR_QT)\extcap /d
        if exist ".\extcap\androiddump.pdb" xcopy ".\extcap\androiddump.pdb" $(INSTALL_DIR_QT)\extcap /d
@@ -1241,6 +1245,8 @@ install-generated-files: doc
        if exist ".\extcap\randpktdump.pdb" xcopy ".\extcap\randpktdump.pdb" $(INSTALL_DIR_QT)\extcap /d
        if exist ".\extcap\sshdump.exe" xcopy ".\extcap\sshdump.exe" $(INSTALL_DIR_QT)\extcap /d
        if exist ".\extcap\sshdump.pdb" xcopy ".\extcap\sshdump.pdb" $(INSTALL_DIR_QT)\extcap /d
+       if exist ".\extcap\ciscodump.exe" xcopy ".\extcap\ciscodump.exe" $(INSTALL_DIR_QT)\extcap /d
+       if exist ".\extcap\ciscodump.pdb" xcopy ".\extcap\ciscodump.pdb" $(INSTALL_DIR_QT)\extcap /d
        if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d
        if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d
        if exist captype.exe xcopy captype.exe $(INSTALL_DIR) /d
@@ -1501,16 +1507,20 @@ checkapi: checkapi_local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd gtk
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
+       cd ../cli
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../win32
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../../epan
-##     $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../epan/crypt
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../dfilter
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../ftypes
-##     $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
+       cd ../wmem
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../wslua
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
        cd ../dissectors