CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
$(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
- $(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_=""
+ $(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
include Makefile.common
-include epan\Makefile.common
-
-BUILT_SOURCES = $(BUILT_SOURCES) \
- svnversion.h
-
-DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=)
-
ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj)
+command_line_OBJECTS = setargv.obj
+
EXTRA_OBJECTS = \
# snprintf.obj \
# strerror.obj \
ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib shell32.lib \
- $(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
+ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
!IFDEF ENABLE_LIBETHEREAL
epan\libethereal.lib \
!ELSE
tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
- $(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
+ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
!IFDEF ENABLE_LIBETHEREAL
epan\libethereal.lib \
!ELSE
$(ZLIB_LIBS)
!ENDIF
+capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+ wsock32.lib user32.lib \
+ $(GLIB_LIBS)
+
editcap_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\netsnmp.lib \
+ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
!IFDEF ENABLE_LIBETHEREAL
epan\libethereal.lib \
!ELSE
randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
user32.lib \
$(GLIB_LIBS) \
- $(NET_SNMP_DIR)\win32\lib\netsnmp.lib
+ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib
-EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
+EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe \
+ capinfos.exe editcap.exe mergecap.exe text2pcap.exe
-RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
+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
all: config.h tools image wiretap epan $(EXECUTABLES) $(RESOURCES) doc
!IFNDEF GTK1_DIR
ethereal.exe :
!ELSE
-ethereal.exe : config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
+ethereal.exe : config.h svnversion.h $(ethereal_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) $(EXTRA_OBJECTS) image\ethereal.res
+ /OUT:ethereal.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK1_LIBS) gtk\libui.lib $(ethereal_OBJECTS) image\ethereal.res
<<
!ENDIF
!IFNDEF GTK2_DIR
ethereal-gtk2.exe :
!ELSE
-ethereal-gtk2.exe : config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_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) 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) $(EXTRA_OBJECTS) image\ethereal.res
+ /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) $(EXTRA_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
+tethereal.exe : config.h svnversion.h $(tethereal_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) $(EXTRA_OBJECTS) image\tethereal.res
+ /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
+ @echo Linking $@
+ $(LINK) @<<
+ /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(command_line_OBJECTS) $(capinfos_LIBS) image\capinfos.res
<<
editcap.exe : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
@echo Linking $@
$(LINK) @<<
- /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.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
@echo Linking $@
$(LINK) @<<
- /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj getopt.obj $(mergecap_LIBS) image\mergecap.res
+ /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
@echo Linking $@
$(LINK) @<<
- /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res
+ /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) $(EXTRA_OBJECTS) epan
+dftest.exe : $(dftest_OBJECTS) epan
$(LINK) @<<
- /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS) $(EXTRA_OBJECTS)
+ /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS)
<<
-randpkt.exe : $(randpkt_OBJECTS) $(EXTRA_OBJECTS)
+randpkt.exe : $(randpkt_OBJECTS)
$(LINK) @<<
- /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS)
+ /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) $(command_line_OBJECTS)
<<
config.h : config.h.win32 config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
-e "s/@HAVE_PCRE@/$(PCRE_CONFIG)/" \
+ -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
-e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
-e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
-e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
+ -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_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \
-e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \
- -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \
< config.h.win32 > $@
ps.c : rdps.exe print.ps
# Build the short version of the authors file for the about dialog
#
AUTHORS-SHORT: AUTHORS make-authors-short.pl
- $(PERL) make-authors-short.pl < AUTHORS > AUTHORS-SHORT
+ $(PERL) perlnoutf.pl make-authors-short.pl < AUTHORS > AUTHORS-SHORT
+#
+# Build the short version of the authors file with formatting codes for
+# the man page
+#
+AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
+ $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
#
# Build "tethereal-tap-register.c", which contains a function
clean: gtk2_distclean
rm -f $(ethereal_OBJECTS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) \
$(EXECUTABLES) $(PDB_FILE) \
- editcap.obj mergecap.obj text2pcap.obj getopt.obj\
+ capinfos.obj editcap.obj mergecap.obj text2pcap.obj getopt.obj\
text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
- rdps.pdb config.h ps.c AUTHORS-SHORT \
- rdps.exe rdps.ilk dftest.obj dftest.exe randpkt.obj randpkt.ext \
+ 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)
cd wiretap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../..
-# Call distclean only, if you would like to remove ALL generated files.
-# Be sure to have python and perl installed to regenerate them.
+# "distclean" removes all files not part of the distribution.
+# It does not remove generated files that are part of the distribution.
distclean: clean gtk2_distclean
- rm -f $(BUILT_SOURCES) \
- tethereal-tap-register.c
+ rm -f config.h $(BUILT_SOURCES)
cd wiretap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../..
+# Make "maintainer-clean" only if you would like to remove ALL generated
+# files.
+# Be sure to have python and perl installed to regenerate them.
+maintainer-clean: distclean
+ rm -f $(GENERATED_FILES)
+ cd wiretap
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../gtk
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../epan
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../plugins
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../tools
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../image
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../doc
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../help
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../packaging/nsis
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+ cd ../..
+
tools::
cd tools
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
gtk2:: help config.h svnversion.h AUTHORS-SHORT
if not exist gtk2.tmp mkdir gtk2.tmp
cd gtk
- cp --update --preserve Makefile.* *.c *.h ..\gtk2.tmp
+ xcopy Makefile.* ..\gtk2.tmp /d /y
+ xcopy *.c ..\gtk2.tmp /d /y
+ xcopy *.h ..\gtk2.tmp /d /y
cd ..\gtk2.tmp
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
cd ..
-epan:: $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) $(RESOURCES) doxygen
+epan:: $(RESOURCES) $(BUILT_SOURCES) doxygen
cd epan
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
doxygen: doxygen.cfg doxygen-run
-REQUIRED_APPS=\
+REQUIRED_TOOLS=\
$(SH) \
$(YACC) \
$(LEX) \
grep \
+ /usr/bin/find \
$(PERL) \
$(PYTHON) \
sed \
unzip \
wget
-verify_apps:
- @$(SH) tools\win32-setup.sh --appverify $(REQUIRED_APPS)
+verify_tools:
+ @$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
-setup: verify_apps
+# 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"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- glib gtk2.4/glib-2.4.2.zip
+ glib gtk2.4/glib-2.4.7.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- glib gtk2.4/glib-dev-2.4.2.zip
+ glib gtk2.4/glib-dev-2.4.7.zip
!ELSE
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
glib glib-2.2.3-20040116.zip
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.zip
+ . net-snmp-5.1.2.zip
!ENDIF
!IFDEF PCAP_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
!ENDIF
!IFDEF ADNS_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- . adns-1.0-win32-03.zip
+ . adns-1.0-win32-04.zip
!ENDIF
!IFDEF PCRE_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
!ENDIF
!IFDEF ZLIB_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- zlib121-dll zlib121-dll.zip
+ zlib122-dll zlib122-dll.zip
!ENDIF
!IFDEF GTK2_DIR
!IF "$(GTK2_INST_VERSION)" == "2.4"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- gtk2 gtk2.4/gtk+-2.4.3.zip
+ gtk2 gtk2.4/gtk+-2.4.14.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- gtk2 gtk2.4/gtk+-dev-2.4.3.zip
+ gtk2 gtk2.4/gtk+-dev-2.4.14.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk2 gtk2.4/atk-1.6.0.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.4"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- gtk2 gtk2.4/pango-1.4.0.zip
+ gtk2 gtk2.4/pango-1.4.1.zip
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- gtk2 gtk2.4/pango-dev-1.4.0.zip
+ gtk2 gtk2.4/pango-dev-1.4.1.zip
!ELSE
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
gtk2 gtk2/pango-1.2.5-20040124.zip
!ENDIF
!IFDEF GTK_WIMP_DIR
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
- gtk-wimp gtk2/gtk-wimp-0.5.4-bin.zip
+ gtk-wimp gtk-wimp/gtk-wimp-0.6.2-bin.zip
!ENDIF
@echo.
@echo Ethereal is ready to build.
+# Cleanup files installed by the setup target. It will not remove the
+# downloaded zip files.
+clean_setup:
+ rm -r -f $(ETHEREAL_LIBS)/glib
+ 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)/gtk2
+ rm -r -f $(ETHEREAL_LIBS)/gtk-wimp
+
update_plugin_api: config.h
cd plugins
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake xyzzy
cd ..
-
git.samba.org / obnox / wireshark / wip.git / blobdiff