diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-12-02 08:30:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-12-02 08:30:29 +0000 |
| commit | 0cc1545d05be6f655c950904b1da776190f3af16 (patch) | |
| tree | b82725615b527304bfb2e9e7d9f3b6dfc50ce7fd /Makefile.am | |
| parent | baf569188ac49ad38912b82d23ff241321cd654f (diff) | |
Move most of the plugin code from epan to wsutil and remove all
knowledge of particular types of plugins. Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.
In particular applications, only process the relevant plugin types.
Add a Makefile.common to the codecs directory.
svn path=/trunk/; revision=53710
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 3ea7abaab6..6a46f4c9ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -311,13 +311,9 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \ -dlopen plugins/wimax/wimax.la \ -dlopen plugins/wimaxmacphy/wimaxmacphy.la -WTAP_PLUGIN_SOURCES = \ - epan/plugins.c - else # HAVE_PLUGINS plugin_ldadd = -WTAP_PLUGIN_SOURCES = endif # HAVE_PLUGINS @@ -389,7 +385,11 @@ if HAVE_Qt wireshark_qt_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark_qt_INCLUDES = $(WIRESHARK_COMMON_INCLUDES) wireshark_qt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) -wireshark_qt_LDADD = ui/qt/libqtui.a $(wireshark_ldadd) @Qt_LIBS@ +wireshark_qt_LDADD = \ + ui/qt/libqtui.a \ + $(wireshark_ldadd) \ + @Qt_LIBS@ + # # XXX - this makes wireshark_qt_LDFLAGS not work; we should figure out # another way to get wireshark-qt linked as a C++ program, perhaps by @@ -403,7 +403,10 @@ if HAVE_GTK wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES) wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) -wireshark_LDADD = ui/gtk/libgtkui.a $(wireshark_ldadd) @GTK_LIBS@ +wireshark_LDADD = \ + ui/gtk/libgtkui.a \ + $(wireshark_ldadd) \ + @GTK_LIBS@ endif # Ideally we could trigger automatic c++ linking here with |