git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Clarify what the special cases in wtap_wtap_encap_to_pcap_encap() are
[metze/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index 24b065714ed3a79924f0fbf0d755bafce2df1d65..42fa30a7f4a1656db17d0b2c58dbd1c0756b8c2d 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -54,25 +54,28 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c
 
 WTAP_PLUGIN_SOURCES = \
-       epan/plugins.c \
-       epan/report_err.c \
-       epan/filesystem.c
+       epan/plugins.c \
+       epan/filesystem.c
 
 include Makefile.common
 
-wireshark_OBJECTS = $(wireshark_SOURCES:.c=.obj)
+wireshark_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj)
 tshark_OBJECTS = $(tshark_SOURCES:.c=.obj)
 rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj)
 ###text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj)
-###mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj)
+mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj)
 editcap_OBJECTS = $(editcap_SOURCES:.c=.obj)
 capinfos_OBJECTS = $(capinfos_SOURCES:.c=.obj)
 dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
 dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj)
 randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj)
 
+#
+# psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx
+#
+
 wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib \
+       wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \
        $(GTHREAD_LIBS) \
        $(HHC_LIBS) \
        wsutil\libwsutil.lib \
@@ -93,7 +96,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !ENDIF
 
 tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib \
+       wsock32.lib user32.lib psapi.lib \
        $(GLIB_LIBS) \
        $(GTHREAD_LIBS) \
        wsutil\libwsutil.lib \
@@ -113,7 +116,7 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !ENDIF
 
 rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib \
+       wsock32.lib user32.lib psapi.lib \
        $(GLIB_LIBS) \
        wsutil\libwsutil.lib \
        $(GNUTLS_LIBS) \
@@ -164,7 +167,7 @@ dumpcap_LIBS= \
        $(GTHREAD_LIBS)
 
 dftest_LIBS=  wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib \
+       wsock32.lib user32.lib psapi.lib \
        $(GLIB_LIBS) \
        wsutil\libwsutil.lib \
        $(GNUTLS_LIBS) \
@@ -186,7 +189,8 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        $(GLIB_LIBS)
 
 EXECUTABLES=wireshark.exe tshark.exe rawshark.exe \
-       capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe reordercap.exe dumpcap.exe
+       capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe \
+       reordercap.exe dumpcap.exe dftest.exe
 
 RESOURCES=image\wireshark.res image\file_dlg_win32.res \
        image\libwireshark.res image\tshark.res image\capinfos.res \
@@ -201,7 +205,7 @@ all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image codecs $(C_ARES_DLL) $(
 packaging: all
        cd packaging
        cd nsis
-       $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
        cd ..
 !ELSE
@@ -215,7 +219,7 @@ packaging_u3: all
        cd packaging
        cd u3
        cd win32
-       $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
        cd ..
        cd ..
@@ -224,7 +228,7 @@ packaging_papps: all
        cd packaging
        cd portableapps
        cd win32
-       $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
        cd ..
        cd ..
@@ -326,8 +330,6 @@ rawshark.exe        : $(LIBS_CHECK) config.h $(rawshark_OBJECTS) epan ui image\rawshark
 # XXX: This makefile does not properly handle doing a 'nmake ... capinfos.exe' directly since some of the .objs
 #      (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all').
 # Linking with setargv.obj enables "wildcard expansion" of command-line arguments
-capinfos.obj   :
-       $(CC) $(CFLAGS) -DENABLE_STATIC -Fd.\ -c capinfos.c
 capinfos.exe   : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
        @echo Linking $@
        $(LINK) @<<
@@ -339,8 +341,6 @@ capinfos.exe        : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib w
 
 # XXX: This makefile does not properly handle doing a 'nmake ... editcap.exe' directly since some of the .objs
 #      (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all').
-editcap.obj    :
-       $(CC) $(CFLAGS) -DENABLE_STATIC -Fd.\ -c editcap.c
 editcap.exe    : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
        @echo Linking $@
        $(LINK) @<<
@@ -351,10 +351,10 @@ editcap.exe       : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsutil\libwsutil.lib wir
 !ENDIF
 
 # Linking with setargv.obj enables "wildcard expansion" of command-line arguments
-mergecap.exe   : $(LIBS_CHECK)  config.h mergecap.obj merge.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
+mergecap.exe   : $(LIBS_CHECK)  config.h $(mergecap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
        @echo Linking $@
        $(LINK) @<<
-               /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) mergecap.obj merge.obj $(mergecap_LIBS) setargv.obj image\mergecap.res
+               /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(mergecap_OBJECTS) $(mergecap_LIBS) image\mergecap.res
 <<
 !IFDEF MANIFEST_INFO_REQUIRED
        mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1
@@ -413,7 +413,7 @@ config.h    : config.h.win32 config.nmake
            -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \
            -e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \
            -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
-           -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
+           -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
            -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
            -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
            -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
@@ -492,8 +492,6 @@ QMAKE_LFLAGS         *= /LARGEADDRESSAWARE $(LDFLAGS)
 
 <<KEEP
 
-ps.c: tools\rdps.py print.ps
-       $(PYTHON) tools\rdps.py print.ps ps.c
 #
 # Build the version string
 #
@@ -524,13 +522,13 @@ text2pcap.obj mergecap.obj capinfos.obj editcap.obj reordercap.obj version_info.
 
 clean-local:
        rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \
-               $(EXECUTABLES) *.pdb *.sbr *.exe.manifest \
-               capinfos.obj capinfos.exp editcap.obj editcap.exp \
+               $(EXECUTABLES) *.pdb *.sbr *.exe.manifest \
+               capinfos.obj capinfos.exp capinfos.lib editcap.obj editcap.exp editcap.lib \
                mergecap.obj text2pcap.obj \
                reordercap.obj nio-ie5.obj update.obj \
-               text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
-               rdps.pdb rdps.exe rdps.ilk config.h ps.c $(LIBS_CHECK) \
-               dftest.obj dftest.exe randpkt.obj randpkt.ext \
+               text2pcap-scanner.obj text2pcap-scanner.c \
+               config.h ps.c $(LIBS_CHECK) \
+               dftest.obj dftest.exe randpkt.obj randpkt.exe \
                doxygen.cfg \
                $(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll \
                libwsutil.dll \
@@ -804,8 +802,8 @@ doxygen-run:
 
 doxygen: doxygen.cfg doxygen-run
 
-services: tools\make-services.pl
-       $(PERL) tools/make-services.pl
+services: tools\make-services.py
+       $(PYTHON) tools/make-services.py
 
 ################################################################################
 # Prepare build environment by downloading and installing required libraries
@@ -829,7 +827,7 @@ REQUIRED_TOOLS=\
        env     \
        grep    \
        --cygwinonly /usr/bin/find      \
-       peflags \
+       peflags \
        $(PERL) \
        $(PYTHON)       \
        sed     \
@@ -900,7 +898,7 @@ process_libs:
 !ENDIF
 !IFDEF PCAP_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-               . WpdPack_$(PCAP_VERSION).zip
+               . WpdPack_$(WPD_VERSION).zip
 !ENDIF
 !IFDEF AIRPCAP_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
@@ -949,7 +947,7 @@ process_libs:
 !ENDIF
 !IFDEF HHC_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-               user-guide user-guide-46501.zip
+               user-guide user-guide-48978.zip
 !ENDIF
 !IFDEF UPX
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
@@ -970,62 +968,64 @@ process_libs:
 # WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO
 # UPDATING REMOVES THE FORMER USER DIRS
 clean_setup:
-    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
-    rm -r -f c-ares-1.7.0-win??ws
-    rm -r -f c-ares-1.7.1-win??ws
-    rm -r -f gettext-0.14.5
-    rm -r -f gettext-runtime-0.17
-    rm -r -f gettext-runtime-0.17-1
-    rm -r -f gettext-0.17-1            # win64
-    rm -r -f glib
-    rm -r -f gnutls-2.8.1-1
-    rm -r -f gnutls-2.8.5-*-win??ws
-    rm -r -f gnutls-2.10.3-*-win??ws
-    rm -r -f gnutls-2.12.18-*-win??ws
+       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
+       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 gettext-0.14.5
+       rm -r -f gettext-runtime-0.17
+       rm -r -f gettext-runtime-0.17-1
+       rm -r -f gettext-0.17-1            # win64
+       rm -r -f glib
+       rm -r -f gnutls-2.8.1-1
+       rm -r -f gnutls-2.8.5-*-win??ws
+       rm -r -f gnutls-2.10.3-*-win??ws
+       rm -r -f gnutls-2.12.18-*-win??ws
 !IF "$(GTK_NAME)" == "gtk2"
-    rm -r -f gtk2
+       rm -r -f gtk2
 !ELSE
-    rm -r -f gtk3
-!ENDIF
-    rm -r -f gtk+
-    rm -r -f gtk-wimp
-    rm -r -f kfw-2.5
-    rm -r -f kfw-3-2-2-final
-    rm -r -f kfw-3.2.2-ws1
-    rm -r -f kfw-3-2-2-i386-ws-vc6
-    rm -r -f libiconv-1.9.1.bin.woe32
-    rm -r -f lua5.1
-    rm -r -f lua5.1.4
-    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 nasm-2.00
-    rm -r -f nasm-2.02
-    rm -r -f nasm-2.09.08
-    rm -r -f pcre-6.4
-    rm -r -f pcre-7.0
-    rm -r -f portaudio_v19
-    rm -r -f portaudio_v19_2
-    rm -r -f upx301w
-    rm -r -f upx303w
-    rm -r -f user-guide
-    rm -r -f zlib123
-    rm -r -f zlib125
-    rm -r -f zlib-1.2.5
-    rm -r -f zlib123-dll
-    rm -r -f AirPcap_Devpack_1_0_0_594
-    rm -r -f AirPcap_Devpack_4_0_0_1480
-    rm -r -f AirPcap_Devpack_4_1_0_1622
-    rm -r -f GeoIP-1.4.5ws
-    rm -r -f GeoIP-1.4.6-win??ws
-    rm -r -f GeoIP-1.4.8-win??ws
-    rm -r -f GeoIP-1.4.8-*-win??ws
-    rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws
-    rm -r -f WpdPack
-    cd "$(MAKEDIR)"
+       rm -r -f gtk3
+!ENDIF
+       rm -r -f gtk+
+       rm -r -f gtk-wimp
+       rm -r -f kfw-2.5
+       rm -r -f kfw-3-2-2-final
+       rm -r -f kfw-3.2.2-ws1
+       rm -r -f kfw-3-2-2-i386-ws-vc6
+       rm -r -f libiconv-1.9.1.bin.woe32
+       rm -r -f lua5.1
+       rm -r -f lua5.1.4
+       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 nasm-2.00
+       rm -r -f nasm-2.02
+       rm -r -f nasm-2.09.08
+       rm -r -f pcre-6.4
+       rm -r -f pcre-7.0
+       rm -r -f portaudio_v19
+       rm -r -f portaudio_v19_2
+       rm -r -f upx301w
+       rm -r -f upx303w
+       rm -r -f user-guide
+       rm -r -f zlib123
+       rm -r -f zlib125
+       rm -r -f zlib-1.2.5
+       rm -r -f zlib123-dll
+       rm -r -f AirPcap_Devpack_1_0_0_594
+       rm -r -f AirPcap_Devpack_4_0_0_1480
+       rm -r -f AirPcap_Devpack_4_1_0_1622
+       rm -r -f GeoIP-1.4.5ws
+       rm -r -f GeoIP-1.4.6-win??ws
+       rm -r -f GeoIP-1.4.8-win??ws
+       rm -r -f GeoIP-1.4.8-*-win??ws
+       rm -r -f GeoIP-1.5.1-*-win??ws
+       rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws
+       rm -r -f WpdPack
+       cd "$(MAKEDIR)"
 
 ################################################################################
 # Prepare the debug trees for running Wireshark/Tshark from there.
@@ -1130,6 +1130,11 @@ install-generated-files:
        cd plugins
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
        cd ..
+       if not exist $(INSTALL_DIR)\profiles mkdir $(INSTALL_DIR)\profiles
+       if not exist $(INSTALL_DIR)\profiles\Bluetooth mkdir $(INSTALL_DIR)\profiles\Bluetooth
+       xcopy ".\profiles\Bluetooth\colorfilters" $(INSTALL_DIR)\profiles\Bluetooth /d
+       if not exist $(INSTALL_DIR)\profiles\Classic mkdir $(INSTALL_DIR)\profiles\Classic
+       xcopy ".\profiles\Classic\colorfilters" $(INSTALL_DIR)\profiles\Classic /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.
@@ -1284,7 +1289,7 @@ install-all: install-generated-files
 
 checkapi_local:
        $(PERL) tools/checkAPIs.pl -build \
-       $(wireshark_SOURCES) \
+       $(WIRESHARK_COMMON_SRC) \
        $(TSHARK_TAP_SRC) \
 #      $(EXTRA_wireshark_SOURCES)
 
Unnamed repository; edit this file to name it for gitweb.