git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Replace a handful of tabs with spaces.
[obnox/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index 1a993d341b3212dae17aa185877e0db4b7704160..b5e9cd568c2b4998b0dd7c923f1f365c039ff01b 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -124,7 +124,7 @@ RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \
 
 LIBS_CHECK=_libs_check_
 
-all: $(LIBS_CHECK) config.h tools image codecs $(ZLIB_DIR)\zlib1.dll wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-deps
+all: $(LIBS_CHECK) config.h tools image codecs $(ZLIB_DLL) wiretap epan $(EXECUTABLES) $(RESOURCES) doc install-deps
 
 packaging: all
        cd packaging
@@ -192,7 +192,7 @@ packaging_zip: packaging_zip1 packaging_zip2
 
 $(RESOURCES): image
 
-wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DIR)\zlib1.dll wiretap
+wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap
 
 !IFNDEF GTK1_DIR
 wireshark.exe  : 
@@ -286,7 +286,7 @@ randpkt.exe : $(randpkt_OBJECTS) getopt.obj
 dumpcap.exe    : $(LIBS_CHECK) config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj epan/unicode-utils.obj inet_ntop.obj mkstemp.obj wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res 
        @echo Linking $@
        $(LINK) @<<
-               /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj epan/unicode-utils.obj inet_ntop.obj mkstemp.obj image\dumpcap.res
+               /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj mkstemp.obj image\dumpcap.res
 <<
 !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" 
        mt.exe -nologo -manifest "dumpcap.exe.manifest" -outputresource:dumpcap.exe;1
@@ -305,6 +305,12 @@ config.h   : config.h.win32 config.nmake
            -e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \
            -e "s/@HAVE_PCAP_BREAKLOOP@/$(PCAP_BREAKLOOP_CONFIG)/" \
+           -e "s/@HAVE_REMOTE@/$(PCAP_HAVE_REMOTE_CONFIG)/" \
+           -e "s/@HAVE_PCAP_REMOTE@/$(PCAP_REMOTE_CONFIG)/" \
+           -e "s/@HAVE_PCAP_OPEN@/$(PCAP_OPEN_CONFIG)/" \
+           -e "s/@HAVE_PCAP_FINDALLDEVS_EX@/$(PCAP_FINDALLDEVS_EX_CONFIG)/" \
+           -e "s/@HAVE_PCAP_CREATESRCSTR@/$(PCAP_CREATESRCSTR_CONFIG)/" \
+           -e "s/@HAVE_PCAP_SETSAMPLING@/$(PCAP_SETSAMPLING_CONFIG)/" \
            -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \
            -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \
            -e "s/@HAVE_LIBGNUTLS@/$(GNUTLS_CONFIG)/" \
@@ -417,9 +423,11 @@ clean: clean-local
 # "distclean" removes all files not part of the distribution.
 # It does not remove generated files that are part of the distribution.
 distclean-local: clean-local
+!IFDEF ZLIB_DIR
        rm -f $(ZLIB_DIR)\zlib1.dll $(ZLIB_DIR)\zlib1.dll.manifest \
                $(ZLIB_DIR)\include\zlib.h $(ZLIB_DIR)\include\zconf.h \
                $(ZLIB_DIR)\lib\zdll.lib 
+!ENDIF
        rm -f config.h $(BUILT_SOURCES)
 
 distclean: distclean-local
@@ -492,11 +500,12 @@ image::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
 
+!IFDEF ZLIB_DIR
 # None MSVC6 variants have to avoid indirectly using msvcrt.dll,
 # therefore compile the zlib dll from source ZLIB_DIR package.
 # To avoid path problems, copy the zlib sources to a temp dir,
 # compile and copy the resulting files back to (source) ZLIB_DIR
-$(ZLIB_DIR)\zlib1.dll:
+$(ZLIB_DLL):
        xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y
        cd zlib.tmp
        $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" 
@@ -512,6 +521,7 @@ $(ZLIB_DIR)\zlib1.dll:
        copy zlib.h $(ZLIB_DIR)\include
        cd ..
     rm -r -f zlib.tmp
+!ENDIF
 
 wiretap::
        cd wiretap
@@ -540,7 +550,7 @@ gtk2:: help config.h svnversion.h AUTHORS-SHORT
        $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
        cd ..
 
-epan:: $(RESOURCES) $(ZLIB_DIR)\zlib1.dll wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen
+epan:: $(RESOURCES) $(ZLIB_DLL) wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen
        cd epan
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
@@ -592,7 +602,6 @@ REQUIRED_TOOLS=\
        /usr/bin/find   \
        $(PERL) \
        $(PYTHON)       \
-       $(NASM) \
        sed     \
        unzip   \
        wget
@@ -633,9 +642,9 @@ process_libs:
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
 !IF "$(GTK2_INST_VERSION)" == "2.12"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               glib gtk2.12/glib-2.14.3.zip
+               glib gtk2.12/glib-2.14.5.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               glib gtk2.12/glib-dev-2.14.3.zip
+               glib gtk2.12/glib-dev-2.14.5.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.10"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                glib gtk2.10/glib-2.12.13.zip
@@ -656,7 +665,7 @@ process_libs:
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gettext-0.14.5 gettext-0.14.5.zip
+               gettext-runtime-0.17 gettext-runtime-0.17.zip
 !IFDEF KFW_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                kfw-2.5 kfw-2.5.zip
@@ -704,13 +713,13 @@ process_libs:
 !IFDEF GTK2_DIR
 !IF "$(GTK2_INST_VERSION)" == "2.12"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/gtk+-2.12.1.zip
+               gtk2 gtk2.12/gtk+-2.12.5.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/gtk+-dev-2.12.1.zip
+               gtk2 gtk2.12/gtk+-dev-2.12.5.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/cairo-1.4.10.zip
+               gtk2 gtk2.12/cairo-1.4.14.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/cairo-dev-1.4.10.zip
+               gtk2 gtk2.12/cairo-dev-1.4.14.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.12/atk-1.20.0.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -748,9 +757,9 @@ process_libs:
 !ENDIF
 !IF "$(PANGO_INST_VERSION)" == "1.18"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/pango-1.18.3.zip
+               gtk2 gtk2.12/pango-1.18.4.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/pango-dev-1.18.3.zip
+               gtk2 gtk2.12/pango-dev-1.18.4.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.10/pango-1.16.4.zip
@@ -774,6 +783,10 @@ process_libs:
 !IFDEF UPX
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                . upx301w.zip
+!ENDIF
+!IFDEF NASM
+       @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+               . nasm-2.00-win32.zip
 !ENDIF
        @echo.
        @echo Wireshark is ready to build.
@@ -852,6 +865,9 @@ install-files2:
 
 install-common-files:
        set copycmd=/y
+!IF "$(MSVC_VARIANT)" == "MSVC2008EE"
+       xcopy "$(MSVCR_DLL)" $(INSTALL_DIR)
+!ENDIF
        if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR)
 !IFDEF ENABLE_LIBWIRESHARK
        xcopy epan\libwireshark.dll $(INSTALL_DIR) /d
@@ -908,6 +924,7 @@ install-common-files:
        xcopy ".\tpncp\*.dat" $(INSTALL_DIR)\tpncp /d
        if not exist $(INSTALL_DIR)\wimaxasncp mkdir $(INSTALL_DIR)\wimaxasncp
        xcopy ".\wimaxasncp\*.*" $(INSTALL_DIR)\wimaxasncp /d
+       if not exist $(INSTALL_DIR)\plugins mkdir $(INSTALL_DIR)\plugins
        if not exist $(INSTALL_DIR)\plugins\$(VERSION) mkdir $(INSTALL_DIR)\plugins\$(VERSION)
        xcopy ".\plugins\agentx\agentx.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\artnet\artnet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
@@ -915,6 +932,7 @@ install-common-files:
        xcopy ".\plugins\ciscosm\ciscosm.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\docsis\docsis.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\enttec\enttec.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
+       xcopy ".\plugins\ethercat\ethercat.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\giop\coseventcomm.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\giop\cosnaming.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\giop\parlay.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
@@ -1060,3 +1078,4 @@ clean-deps2:
 clean-deps: clean-deps1 clean-deps2
 
 
+
git mirror of the wireshark svn