diff options
author | Lars Roland <Lars.Roland@gmx.net> | 2005-03-05 06:28:10 +0000 |
---|---|---|
committer | Lars Roland <Lars.Roland@gmx.net> | 2005-03-05 06:28:10 +0000 |
commit | 00273300e721999ac67a4ce66dab80fed6a1314f (patch) | |
tree | ac2c8b87fdd4dc989c3ef1d3b646f7700ba7626c /plugins/docsis/Makefile.nmake | |
parent | 1a7b3ec1439203e3bea3381dfb31b4357758b4c3 (diff) | |
download | wireshark-00273300e721999ac67a4ce66dab80fed6a1314f.tar.gz |
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.
svn path=/trunk/; revision=13596
Diffstat (limited to 'plugins/docsis/Makefile.nmake')
-rw-r--r-- | plugins/docsis/Makefile.nmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index e565427852..ea8916603a 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -11,12 +11,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-intrngreq.obj packet-type29ucd.obj \ packet-docsis.obj packet-bpkmattr.obj \ @@ -36,6 +33,8 @@ docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) link -dll /out:docsis.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) +!ENDIF + clean: rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib *.pdb |