aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mate
diff options
context:
space:
mode:
authorlroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7>2005-03-05 06:28:10 +0000
committerlroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7>2005-03-05 06:28:10 +0000
commitca98965cb485a9a167d5915327e82dc7f0eb71f5 (patch)
treeac2c8b87fdd4dc989c3ef1d3b646f7700ba7626c /plugins/mate
parentf58c4ab7c2a03a15d1506dfbb8db58fcdb9b559a (diff)
Preparations for dropping the old plugin api.
Introduce a new init routine for plugins, which does not take the plugin api table as an argument and allows etheral to distinguish between plugins using the old and the new api. Update README.plugins accordingly Change all g_warnings() in epan/plugins.c to report_failue(). On windows we do not have a log console open while loading the plugins, because a log console cannot be opened before the prefs have been read. Thus g_warnings() does not work for reporting problems with plugins. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13596 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins/mate')
-rw-r--r--plugins/mate/Makefile.nmake7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index b08d92c111..c439e2ac5a 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -15,12 +15,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
OBJECTS=packet-mate.obj mate_setup.obj mate_runtime.obj mate_util.obj mate_plugin.obj
@@ -28,6 +25,8 @@ mate.dll mate.exp mate.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
link -dll /out:mate.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS)
+!ENDIF
+
clean:
rm -f $(OBJECTS) mate.dll mate.exp mate.lib *.pdb