diff options
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | Makefile.common | 10 | ||||
| -rw-r--r-- | capinfos.c | 12 | ||||
| -rw-r--r-- | editcap.c | 16 |
4 files changed, 27 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index 782790e63e..51c014392f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -207,8 +207,6 @@ radius_DATA = \ PLATFORM_SRC = capture-pcap-util-unix.c -include Makefile.common - if HAVE_PLUGINS plugin_ldadd = \ @@ -238,13 +236,22 @@ plugin_ldadd = \ -dlopen plugins/stats_tree/stats_tree.la \ -dlopen plugins/v5ua/v5ua.la \ -dlopen plugins/wimax/wimax.la + +WTAP_PLUGIN_SOURCES = \ + epan/plugins.c \ + epan/report_err.c \ + epan/privileges.c \ + epan/filesystem.c else # HAVE_PLUGINS plugin_ldadd = +WTAP_PLUGIN_SOURCES = endif # HAVE_PLUGINS +include Makefile.common + # Optional objects that I know how to build. These will be # linked into the wireshark executable. # They will also be linked into the tshark executable; if this diff --git a/Makefile.common b/Makefile.common index 1ff0d2e0f9..bbc50466f2 100644 --- a/Makefile.common +++ b/Makefile.common @@ -211,17 +211,11 @@ mergecap_SOURCES = \ editcap_SOURCES = \ editcap.c \ epan/crypt/crypt-md5.c \ - epan/plugins.c \ - epan/report_err.c \ - epan/privileges.c \ - epan/filesystem.c + $(WTAP_PLUGIN_SOURCES) capinfos_SOURCES = \ capinfos.c \ - epan/plugins.c \ - epan/report_err.c \ - epan/privileges.c \ - epan/filesystem.c + $(WTAP_PLUGIN_SOURCES) # dftest specifics dftest_SOURCES = \ diff --git a/capinfos.c b/capinfos.c index bda6ea6faa..f48777a678 100644 --- a/capinfos.c +++ b/capinfos.c @@ -272,18 +272,20 @@ int main(int argc, char *argv[]) extern int optind; int opt; int status = 0; +#ifdef HAVE_PLUGINS char* init_progfile_dir_error; /* Register wiretap plugins */ if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) { - g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error); - g_free(init_progfile_dir_error); + g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error); + g_free(init_progfile_dir_error); } else { - init_report_err(failure_message,NULL,NULL); - init_plugins(); - register_all_wiretap_modules(); + init_report_err(failure_message,NULL,NULL); + init_plugins(); + register_all_wiretap_modules(); } +#endif /* Process the options */ @@ -380,17 +380,19 @@ int main(int argc, char *argv[]) int split_packet_count = 0; int written_count = 0; char *filename; +#ifdef HAVE_PLUGINS char* init_progfile_dir_error; - + /* Register wiretap plugins */ - if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) { - g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error); - g_free(init_progfile_dir_error); + if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) { + g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error); + g_free(init_progfile_dir_error); } else { - init_report_err(failure_message,NULL,NULL); - init_plugins(); - register_all_wiretap_modules(); + init_report_err(failure_message,NULL,NULL); + init_plugins(); + register_all_wiretap_modules(); } +#endif /* Process the options */ while ((opt = getopt(argc, argv, "A:B:c:C:dE:F:hrs:t:T:v")) !=-1) { |