From c9f54aa1c3a71c330c30ebc7a178922d179f912e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sun, 17 Dec 2017 12:44:50 +0000 Subject: autotools: Fixup plugins Custom.*.example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit plugin_ldadd was removed in 262a84c384353b2a88a6e81cdc499ab94a8316c2. Change-Id: I516aa1be3466433bf8db83ab3d1773bf88082e8c Reviewed-on: https://code.wireshark.org/review/24850 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- doc/README.plugins | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'doc') diff --git a/doc/README.plugins b/doc/README.plugins index dcb34a35b2..de18dcb5c8 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -121,21 +121,7 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ irda \ -3.2.2 Changes to the top level Makefile.am - -Add your plugin (in alphabetical order) to plugin_ldadd: - -if HAVE_PLUGINS - -plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \ - ... - -dlopen plugins/ethercat/ethercat.la \ - -dlopen plugins/foo/foo.la \ - -dlopen plugins/gryphon/gryphon.la \ - -dlopen plugins/irda/irda.la \ - ... - -3.2.3 Changes to the top level configure.ac +3.2.2 Changes to the top level configure.ac You need to add your plugins Makefile (in alphabetical order) to the AC_OUTPUT rule in the configure.ac @@ -149,7 +135,7 @@ AC_OUTPUT( ... ,) -3.2.4 Changes to epan/Makefile.am +3.2.3 Changes to epan/Makefile.am Add the relative path of all your plugin source files (in alphbetical order) to plugin_src: @@ -164,7 +150,7 @@ plugin_src = \ ../plugins/irda/packet-irda.c \ ... -3.2.5 Changes to CMakeLists.txt +3.2.4 Changes to CMakeLists.txt Add your plugin (in alphabetical order) to the PLUGIN_SRC_DIRS: @@ -178,12 +164,12 @@ if(ENABLE_PLUGINS) plugins/irda ... -3.2.6 Changes to the installers +3.2.5 Changes to the installers If you want to include your plugin in an installer you have to add lines in the NSIS installer wireshark.nsi file. -3.2.6.1 Changes to packaging/nsis/wireshark.nsi +3.2.5.1 Changes to packaging/nsis/wireshark.nsi Add the relative path of your plugin DLL (in alphbetical order) to the list of "File" statements in the "Dissector Plugins" section: @@ -193,7 +179,7 @@ File "${STAGING_DIR}\plugins\${VERSION}\foo.dll" File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll" File "${STAGING_DIR}\plugins\${VERSION}\irda.dll" -3.2.6.2 Other installers +3.2.5.2 Other installers The PortableApps installer copies plugins from the build directory and should not require configuration. -- cgit v1.2.3