summaryrefslogtreecommitdiff
path: root/epan/Makefile.common
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-05-09 10:03:41 +0000
committerGuy Harris <guy@alum.mit.edu>2004-05-09 10:03:41 +0000
commit15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch)
tree96fab6287a112ff9379ebf012a7a939884b62ec1 /epan/Makefile.common
parentb964421aec471b54755db1ab9ebc768467b6fdd5 (diff)
downloadwireshark-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 'epan/Makefile.common')
-rw-r--r--epan/Makefile.common5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 1999c234f8..dd4e17b8a6 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
-# $Id: Makefile.common,v 1.22 2004/05/08 08:49:02 guy Exp $
+# $Id: Makefile.common,v 1.23 2004/05/09 10:03:40 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -498,12 +498,13 @@ DISSECTOR_SUPPORT_SRC = \
../crypt-md5.c \
../crypt-rc4.c \
../follow.c \
- ../g711.c \
../h225-persistentdata.c \
../in_cksum.c \
../ipproto.c \
../packet-dcerpc-nt.c \
../prefs.c \
+ ../print.c \
+ ../ps.c \
../ptvcursor.c \
../reassemble.c \
../req_resp_hdrs.c \