diff options
| author | lego <lego@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-05-25 17:22:32 +0000 |
|---|---|---|
| committer | lego <lego@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-05-25 17:22:32 +0000 |
| commit | 2d7d7e8a3cef42fcc1c81a7aae3ac9c82af8d200 (patch) | |
| tree | 2ff6203726b046cb044b2ba9f79980fd79fea61d /Makefile.common | |
| parent | 0f38125f81522d0d2d65bfd455924dfe3f48d39a (diff) | |
Have editcap and capinfos loading the wiretap plugins.
epan/filesystem.c
have get_plugin_dir() calling init_plugin_dir() if necessary
epan/epan.c and epan/report_err.c
move the report_failure family into the new report_err.c file, have epan_init() calling the initializer
epan/plugins.h and epan/proto.c
do not have init_plugins() calling the proto_reg functions instead do it in init_proto()
gtk/main.c and tshark.c
init_plugin_dir() has become suprefluous
capinfos.c and editcap.c
load the wiretap plugins
Makefiles
do what's needed to build withe the above changes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21935 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 5090d80538..5358531d08 100644 --- a/Makefile.common +++ b/Makefile.common @@ -207,7 +207,18 @@ mergecap_SOURCES = \ # editcap specifics editcap_SOURCES = \ editcap.c \ - epan/crypt/crypt-md5.c + epan/crypt/crypt-md5.c \ + epan/plugins.c \ + epan/report_err.c \ + epan/privileges.c \ + epan/filesystem.c + +capinfos_SOURCES = \ + capinfos.c \ + epan/plugins.c \ + epan/report_err.c \ + epan/privileges.c \ + epan/filesystem.c # dftest specifics dftest_SOURCES = \ |