diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
| commit | 15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch) | |
| tree | 96fab6287a112ff9379ebf012a7a939884b62ec1 /doc | |
| parent | b964421aec471b54755db1ab9ebc768467b6fdd5 (diff) | |
| download | wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.tar.gz | |
From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
libethereal.dll or not;
remove "./wiretap" from PATH to prevent problems due to
wrongly-loaded files;
build dissector.lib with MSVC;
move "print.c" and "ps.c" to the dissector helpers, as "print.c"
imports variables from packet-frame.c and packet-data.c, which
are in libethereal;
move "g711.c" out of the dissector helpers, as they're used only
by Ethereal in a tap, not in Tethereal or in any dissector;
add a .def file for libethereal;
arrange to declare global variables exported from libethereal
with "__declspec(dllimport)" when building programs that import
those variables;
update the NSIS installer.
Make the "configure" script define ETH_VAR_IMPORT as "extern".
svn path=/trunk/; revision=10834
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.nmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake index c21c42a2b6..5cc030ee5d 100644 --- a/doc/Makefile.nmake +++ b/doc/Makefile.nmake @@ -1,7 +1,7 @@ # Makefile.nmake # Nmake file for Ethereal documentation # -# $Id: Makefile.nmake,v 1.13 2004/04/25 09:02:02 ulfl Exp $ +# $Id: Makefile.nmake,v 1.14 2004/05/09 10:03:39 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -62,7 +62,7 @@ ethereal-filter.4: ethereal-filter.pod ../config.h $(POD2MAN) \ --center="The Ethereal Network Analyzer" \ --release=$(VERSION) \ - ethereal-filter.pod > ethereal.4 + ethereal-filter.pod > ethereal.4 ethereal-filter.html: ethereal-filter.pod ../config.h $(POD2HTML) \ @@ -72,7 +72,12 @@ ethereal-filter.html: ethereal-filter.pod ../config.h ethereal-filter.pod: ethereal-filter.pod.template ../tethereal.exe cd .. + cp --update --preserve wiretap/wiretap-$(WTAP_VERSION).dll wiretap-$(WTAP_VERSION).dll +!IFDEF ENABLE_LIBETHEREAL + cp --update --preserve epan/libethereal.dll libethereal.dll +!ENDIF tethereal.exe -G | $(PERL) doc\dfilter2pod.pl doc\ethereal-filter.pod.template > doc\ethereal-filter.pod + rm -f libethereal.dll wiretap-$(WTAP_VERSION).dll cd doc editcap.1: editcap.pod ../config.h |