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 /Makefile.common | |
| 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 'Makefile.common')
| -rw-r--r-- | Makefile.common | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index 4279572f3b..3ec952c380 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.41 2004/05/01 21:18:09 guy Exp $ +# $Id: Makefile.common,v 1.42 2004/05/09 10:03:36 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -223,7 +223,6 @@ DISSECTOR_SUPPORT_INCLUDES = \ etypes.h \ follow.h \ format-oid.h \ - g711.h \ greproto.h \ h225-persistentdata.h \ in_cksum.h \ @@ -236,6 +235,8 @@ DISSECTOR_SUPPORT_INCLUDES = \ ppptypes.h \ prefs-int.h \ prefs.h \ + print.h \ + ps.h \ ptvcursor.h \ reassemble.h \ req_resp_hdrs.h \ @@ -262,8 +263,6 @@ ETHEREAL_COMMON_SRC = \ conditions.c \ disabled_protos.c \ pcap-util.c \ - print.c \ - ps.c \ range.c \ ringbuffer.c \ timestats.c \ @@ -281,8 +280,6 @@ ETHEREAL_COMMON_INCLUDES = \ file.h \ pcap-util.h \ pcap-util-int.h \ - print.h \ - ps.h \ range.h \ register.h \ ringbuffer.h \ @@ -334,6 +331,7 @@ ethereal_SOURCES = \ capture.c \ file.c \ filters.c \ + g711.c \ proto_hier_stats.c \ summary.c @@ -342,6 +340,7 @@ ethereal_INCLUDES = \ alert_box.h \ capture.h \ filters.h \ + g711.h \ globals.h \ menu.h \ progress_dlg.h \ |