tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
+dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj)
+
randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj)
-command_line_OBJECTS = setargv.obj
+command_line_OBJECTS =
+
+#setargv.obj
EXTRA_OBJECTS = \
# snprintf.obj \
wsock32.lib user32.lib \
$(GLIB_LIBS)
+dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+ wsock32.lib user32.lib \
+ $(GLIB_LIBS)
+
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib
EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe \
- capinfos.exe editcap.exe mergecap.exe text2pcap.exe
+ capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe dumpcap.exe
RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res \
image\capinfos.res image\editcap.res image\mergecap.res \
- image\text2pcap.res image\wiretap.res
+ image\text2pcap.res image\wiretap.res image\dumpcap.res
all: config.h tools image wiretap epan $(EXECUTABLES) $(RESOURCES) doc
!IFNDEF GTK1_DIR
ethereal.exe :
!ELSE
-ethereal.exe : config.h svnversion.h $(ethereal_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
+ethereal.exe : config.h svnversion.h $(ethereal_OBJECTS) $(command_line_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
@echo Linking $@
$(LINK) @<<
/OUT:ethereal.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK1_LIBS) gtk\libui.lib $(ethereal_OBJECTS) image\ethereal.res
!IFNDEF GTK2_DIR
ethereal-gtk2.exe :
!ELSE
-ethereal-gtk2.exe : config.h svnversion.h $(ethereal_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins
+ethereal-gtk2.exe : config.h svnversion.h $(ethereal_OBJECTS) $(command_line_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins
@echo Linking $@
$(LINK) @<<
/OUT:ethereal-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(ethereal_OBJECTS) image\ethereal.res
<<
!ENDIF
-tethereal.exe : config.h svnversion.h $(tethereal_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
+tethereal.exe : config.h svnversion.h $(tethereal_OBJECTS) $(command_line_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
@echo Linking $@
$(LINK) @<<
/OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(command_line_OBJECTS) image\tethereal.res
<<
-capinfos.exe : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
+capinfos.exe : config.h capinfos.obj getopt.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
@echo Linking $@
$(LINK) @<<
/OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(command_line_OBJECTS) $(capinfos_LIBS) image\capinfos.res
/OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(command_line_OBJECTS) $(editcap_LIBS) image\editcap.res
<<
-mergecap.exe : config.h svnversion.h mergecap.obj merge.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
+mergecap.exe : config.h svnversion.h mergecap.obj merge.obj getopt.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
@echo Linking $@
$(LINK) @<<
/OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj getopt.obj $(command_line_OBJECTS) $(mergecap_LIBS) image\mergecap.res
<<
-text2pcap.exe : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res
+text2pcap.exe : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj $(command_line_OBJECTS) image\text2pcap.res
@echo Linking $@
$(LINK) @<<
/OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj $(command_line_OBJECTS) image\text2pcap.res
<<
dftest.exe : $(dftest_OBJECTS) epan
+ @echo Linking $@
$(LINK) @<<
/OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS)
<<
-randpkt.exe : $(randpkt_OBJECTS)
+randpkt.exe : $(randpkt_OBJECTS) $(command_line_OBJECTS)
+ @echo Linking $@
$(LINK) @<<
/OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) $(command_line_OBJECTS)
<<
+dumpcap.exe : config.h svnversion.h $(dumpcap_OBJECTS) $(command_line_OBJECTS) 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) $(command_line_OBJECTS) mkstemp.obj image\dumpcap.res
+<<
+
+
config.h : config.h.win32 config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
rdps.pdb rdps.exe rdps.ilk config.h ps.c AUTHORS-SHORT \
AUTHORS-SHORT-FORMAT \
- dftest.obj dftest.exe randpkt.obj randpkt.ext doxygen.cfg \
- $(RESOURCES)
+ dftest.obj dftest.exe randpkt.obj randpkt.ext dumpcap.obj \
+ doxygen.cfg \
+ $(RESOURCES) libethereal.dll wiretap-$(WTAP_VERSION).dll
cd wiretap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../gtk
gtk2:: help config.h svnversion.h AUTHORS-SHORT
if not exist gtk2.tmp mkdir gtk2.tmp
cd gtk
- xcopy Makefile.* ..\gtk2.tmp /d /y
- xcopy *.c ..\gtk2.tmp /d /y
- xcopy *.h ..\gtk2.tmp /d /y
+ set copycmd=/y
+ xcopy Makefile.* ..\gtk2.tmp /d
+ xcopy *.c ..\gtk2.tmp /d
+ xcopy *.h ..\gtk2.tmp /d
cd ..\gtk2.tmp
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
cd ..
# Prepare build environment by downloading and installing required libraries
################################################################################
+# The required tools to build Ethereal.
+#
+# The 'find' tool is available both in \WINNT\System32 and in cygwin's /usr/bin.
+# We only need the cygwin version (for some shell scripts).
+# In the PATH, System32 is before cygwin's dir, so explicitly check for /usr/bin/find.
REQUIRED_TOOLS=\
+ $(CC) \
+ $(LINK) \
+ nmake \
$(SH) \
$(YACC) \
$(LEX) \
+ env \
grep \
/usr/bin/find \
$(PERL) \
# Download and install all the required libraries into ETHEREAL_LIBS.
# If you used this setup target before, consider doing a clean_setup.
setup: verify_tools
-!IF "$(GTK2_INST_VERSION)" == "2.4"
+!IF "$(GTK2_INST_VERSION)" == "2.8"
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ glib gtk2.8/glib-2.8.4-20051212.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ glib gtk2.8/glib-dev-2.8.4-20051212.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ glib gtk2.6/glib-2.6.6.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ glib gtk2.6/glib-dev-2.6.6.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
glib gtk2.4/glib-2.4.7.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gettext-runtime-0.13.1 gettext-runtime-0.13.1.zip
!IFDEF NET_SNMP_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- . net-snmp-5.1.2.zip
+ . net-snmp-5.2.1.2.zip
!ENDIF
!IFDEF PCAP_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- . wpdpack_3_0.zip
+ . WpdPack_3_1.zip
!ENDIF
!IFDEF ADNS_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- . adns-1.0-win32-04.zip
+ . adns-1.0-win32-05.zip
!ENDIF
!IFDEF PCRE_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- . pcre-4.4.zip
+ pcre-6.4 pcre-6.4-bin.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ pcre-6.4 pcre-6.4-lib.zip
!ENDIF
!IFDEF ZLIB_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- zlib122-dll zlib122-dll.zip
+ zlib123-dll zlib123-dll.zip
!ENDIF
!IFDEF GTK2_DIR
-!IF "$(GTK2_INST_VERSION)" == "2.4"
+!IF "$(GTK2_INST_VERSION)" == "2.8"
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/gtk+-2.8.9.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/gtk+-dev-2.8.9.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/cairo-1.0.2.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/cairo-dev-1.0.2.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/atk-1.10.3.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/atk-dev-1.10.3.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/libpng-1.2.8-bin.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.6/gtk+-2.6.9.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.6/gtk+-dev-2.6.9.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.6/atk-1.9.0.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.6/atk-dev-1.9.0.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk2 gtk2.4/gtk+-2.4.14.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk2 gtk2/atk-dev-1.4.0.zip
!ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.4"
+!IF "$(PANGO_INST_VERSION)" == "1.10"
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/pango-1.10.1.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.8/pango-dev-1.10.1.zip
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.6/pango-1.8.2.zip
+ @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+ gtk2 gtk2.6/pango-dev-1.8.2.zip
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk2 gtk2.4/pango-1.4.1.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
rm -r -f $(ETHEREAL_LIBS)/gtk+
rm -r -f $(ETHEREAL_LIBS)/libiconv-1.9.1.bin.woe32
rm -r -f $(ETHEREAL_LIBS)/gettext-runtime-0.13.1
- rm -r -f $(ETHEREAL_LIBS)/zlib122-dll
+ rm -r -f $(ETHEREAL_LIBS)/zlib123-dll
rm -r -f $(ETHEREAL_LIBS)/gtk2
rm -r -f $(ETHEREAL_LIBS)/gtk-wimp
# to the source tree, so you can run (t)ethereal directly from there.
# Note that the gtk2 version of ethereal is called ethereal-gtk2.exe
-install-deps: clean_deps install-gtk1-deps install-gtk2-deps
+install-deps: clean-deps install-gtk1-deps install-gtk2-deps
cd plugins
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
cd ..
install-gtk2-deps: install-required-deps
!IFDEF GTK2_DIR
- xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll . /d /y
- xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll . /d /y
- xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll . /d /y
- xcopy $(GTK2_DIR)\bin\libatk-1.0-0.dll . /d /y
- xcopy $(GTK2_DIR)\bin\libpango-1.0-0.dll . /d /y
- xcopy $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll . /d /y
+ set copycmd=/y
+ xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll . /d
+ xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll . /d
+ xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll . /d
+ xcopy $(GTK2_DIR)\bin\libatk-1.0-0.dll . /d
+ xcopy $(GTK2_DIR)\bin\libpango-1.0-0.dll . /d
+ xcopy $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll . /d
mkdir etc
mkdir etc\gtk-2.0
mkdir etc\pango
mkdir lib
mkdir lib\gtk-2.0
- mkdir lib\gtk-2.0\$(GTK2_INST_VERSION).0
- mkdir lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders
- mkdir lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules
+ mkdir lib\gtk-2.0\$(GTK2_LIB_DIR)
+ mkdir lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders
+ mkdir lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
mkdir lib\pango
- mkdir lib\pango\$(PANGO_INST_VERSION).0
- mkdir lib\pango\$(PANGO_INST_VERSION).0\modules
- xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* etc\gtk-2.0 /d /y
- xcopy $(GTK2_DIR)\etc\pango\pango.* etc\pango /d /y
- xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders\libpixbufloader-*.dll lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders /d /y
- xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules\im-*.dll lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules /d /y
- xcopy $(GTK2_DIR)\lib\pango\$(PANGO_INST_VERSION).0\modules\pango-*.dll lib\pango\$(PANGO_INST_VERSION).0\modules /d /y
+ mkdir lib\pango\$(PANGO_LIB_DIR)
+ mkdir lib\pango\$(PANGO_LIB_DIR)\modules
+ xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* etc\gtk-2.0 /d
+ xcopy $(GTK2_DIR)\etc\pango\pango.* etc\pango /d
+ xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d
+ xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d
+ xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll lib\pango\$(PANGO_LIB_DIR)\modules /d
+!IFDEF NEED_LIBPNG_DLL
+ xcopy $(GTK2_DIR)\bin\libpng13.dll . /d
+!ENDIF
!ENDIF
install-gtk1-deps: install-required-deps
!IFDEF GTK1_DIR
- xcopy $(GTK1_DIR)\lib\libgtk-0.dll . /d /y
- xcopy $(GTK1_DIR)\lib\libgdk-0.dll . /d /y
+ set copycmd=/y
+ xcopy $(GTK1_DIR)\lib\libgtk-0.dll . /d
+ xcopy $(GTK1_DIR)\lib\libgdk-0.dll . /d
!ENDIF
install-required-deps:
- xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d /y
+ set copycmd=/y
+ xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d
!IFDEF ENABLE_LIBETHEREAL
- xcopy epan\libethereal.dll . /d /y
+ xcopy epan\libethereal.dll . /d
!ENDIF
- xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll . /d /y
- xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll . /d /y
- xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll . /d /y
- xcopy $(ICONV_DIR)\bin\iconv.dll . /d /y
- xcopy $(GETTEXT_DIR)\bin\intl.dll . /d /y
+ xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll . /d
+ xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll . /d
+ xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll . /d
+ xcopy $(ICONV_DIR)\bin\iconv.dll . /d
+ xcopy $(GETTEXT_DIR)\bin\intl.dll . /d
!IFDEF ZLIB_DIR
- xcopy $(ZLIB_DIR)\zlib1.dll . /d /y
+ xcopy $(ZLIB_DIR)\zlib1.dll . /d
!ENDIF
!IFDEF ADNS_DIR
- xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll . /d /y
+ xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll . /d
!ENDIF
!IFDEF PCRE_DIR
- xcopy $(PCRE_DIR)\bin\pcre.dll . /d /y
+ xcopy $(PCRE_DIR)\bin\pcre.dll . /d
!ENDIF
-clean_deps:
+clean-deps:
rm -f *.dll
rm -rf etc
rm -rf lib
cd plugins
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean_deps
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
cd ..
git.samba.org / obnox / wireshark / wip.git / blobdiff