X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=Makefile.nmake;h=032af855d33fc4272161e0b14a23cea82f827723;hp=81064689b581437deb1d9f3cd19123cbd96fadc9;hb=ba9e27cac6048ed746668fd9014e092ccee24973;hpb=e5a3c5c1f13f23b6128e45a4eac0ec6cd43eb1f5 diff --git a/Makefile.nmake b/Makefile.nmake index 81064689b5..032af855d3 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -16,32 +16,25 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) 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 .c.obj:: $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< -PLATFORM_SRC = capture-wpcap.c +PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c 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 \ @@ -111,7 +104,7 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(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 RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res \ image\capinfos.res image\editcap.res image\mergecap.res \ @@ -165,31 +158,31 @@ ethereal-gtk2.exe : config.h svnversion.h $(ethereal_OBJECTS) epan gtk2 image\et 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) 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 $(capinfos_LIBS) image\capinfos.res + /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) epan @@ -199,7 +192,7 @@ dftest.exe : $(dftest_OBJECTS) epan 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 @@ -273,7 +266,7 @@ clean: gtk2_distclean 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) + $(RESOURCES) libethereal.dll wiretap-$(WTAP_VERSION).dll cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../gtk @@ -294,11 +287,10 @@ clean: gtk2_distclean $(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 @@ -319,6 +311,31 @@ distclean: clean gtk2_distclean $(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 @@ -343,12 +360,14 @@ gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen 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) $(BUILT_SOURCES) doxygen +epan:: $(RESOURCES) $(BUILT_SOURCES) doxygen cd epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. @@ -379,11 +398,20 @@ doxygen-run: doxygen: doxygen.cfg doxygen-run +################################################################################ +# Prepare build environment by downloading and installing required libraries +################################################################################ + REQUIRED_TOOLS=\ + $(CC) \ + $(LINK) \ + nmake \ $(SH) \ $(YACC) \ $(LEX) \ + env \ grep \ + find \ $(PERL) \ $(PYTHON) \ sed \ @@ -419,7 +447,7 @@ setup: verify_tools 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)" \ @@ -435,14 +463,14 @@ setup: verify_tools !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" @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk2 gtk2.4/gtk+-2.4.10-20041001.zip + gtk2 gtk2.4/gtk+-2.4.14.zip @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ - gtk2 gtk2.4/gtk+-dev-2.4.10.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)" \ @@ -483,12 +511,81 @@ clean_setup: 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 -update_plugin_api: config.h +################################################################################ +# Prepare the source tree for running (t)ethereal directly from there. +################################################################################ + +# "install-deps" will copy all dlls needed to run (t)ethereal +# 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 cd plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake xyzzy + $(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 + 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\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 +!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 +!ENDIF + +install-required-deps: + xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d /y +!IFDEF ENABLE_LIBETHEREAL + xcopy epan\libethereal.dll . /d /y +!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 +!IFDEF ZLIB_DIR + xcopy $(ZLIB_DIR)\zlib1.dll . /d /y +!ENDIF +!IFDEF ADNS_DIR + xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll . /d /y +!ENDIF +!IFDEF PCRE_DIR + xcopy $(PCRE_DIR)\bin\pcre.dll . /d /y +!ENDIF + +clean_deps: + rm -f *.dll + rm -rf etc + rm -rf lib + cd plugins + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean_deps + cd .. + +