osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

autotools: Fixup plugins Custom.*.example 

plugin_ldadd was removed in 262a84c384.

Change-Id: I516aa1be3466433bf8db83ab3d1773bf88082e8c
Reviewed-on: https://code.wireshark.org/review/24850
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2017-12-17 12:44:50 +00:00 committed by João Valverde
parent 6159c2be18
commit c9f54aa1c3
6 changed files with 26 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -418,7 +418,6 @@ wireshark_common_ldadd = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
$(plugin_ldadd) \
@PCAP_LIBS@ \
$(EPAN_EXTRA_LIBS) \
@LIBNL_LIBS@
@ -490,7 +489,6 @@ tshark_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
${EPAN_EXTRA_LIBS}
@ -511,7 +509,6 @@ tfshark_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
${EPAN_EXTRA_LIBS}
@ -532,7 +529,6 @@ rawshark_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
${EPAN_EXTRA_LIBS}
@ -561,7 +557,6 @@ sharkd_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
${EPAN_EXTRA_LIBS}
@ -683,7 +678,6 @@ dftest_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
epan/libwireshark.la \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
${EPAN_EXTRA_LIBS}

6
configure.ac
View File

@ -2689,8 +2689,8 @@ AH_BOTTOM([#include <ws_diag_control.h>])
dnl Save the cacheable configure results to config.cache before recursing
AC_CACHE_SAVE
sinclude(plugins/Custom.m4) dnl
ifdef(_CUSTOM_AC_OUTPUT_,, define(_CUSTOM_AC_OUTPUT_, )) dnl
m4_sinclude(plugins/Custom.m4) dnl
m4_ifndef(_CUSTOM_PLUGIN_CONFIG_FILES_, m4_define(_CUSTOM_PLUGIN_CONFIG_FILES_)) dnl
sinclude(epan/dissectors/asn1/Custom.m4) dnl
ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
@ -2855,6 +2855,7 @@ AC_CONFIG_FILES(
plugins/wimax/Makefile
plugins/wimaxasncp/Makefile
plugins/wimaxmacphy/Makefile
_CUSTOM_PLUGIN_CONFIG_FILES_
randpkt_core/doxygen.cfg
randpkt_core/Makefile
tools/Makefile
@ -2863,7 +2864,6 @@ AC_CONFIG_FILES(
writecap/Makefile
writecap/doxygen.cfg
wsutil/Makefile
_CUSTOM_AC_OUTPUT_
)
AC_OUTPUT

26
doc/README.plugins
View File

@ -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.

2
plugins/Custom.m4.example
View File

@ -1,3 +1,3 @@
#
m4_define([_CUSTOM_AC_OUTPUT_], [plugins/foo/Makefile])
m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/foo/Makefile])

3
plugins/Custom.make.example
View File

@ -6,6 +6,3 @@ _CUSTOM_SUBDIRS_ = \
_CUSTOM_EXTRA_DIST_ = \
Custom.m4 \
Custom.make
_CUSTOM_plugin_ldadd_ = \
-dlopen plugins/foo/foo.la

31
plugins/Makefile.am
View File

@ -21,25 +21,26 @@
-include Custom.make
SUBDIRS = $(_CUSTOM_SUBDIRS_) \
docsis \
ethercat \
gryphon \
irda \
mate \
opcua \
profinet \
stats_tree \
transum \
unistim \
wimax \
wimaxasncp \
SUBDIRS = \
$(_CUSTOM_SUBDIRS_) \
docsis \
ethercat \
gryphon \
irda \
mate \
opcua \
profinet \
stats_tree \
transum \
unistim \
wimax \
wimaxasncp \
wimaxmacphy
EXTRA_DIST = \
$(_CUSTOM_EXTRA_DIST_) \
Custom.make.example \
Custom.m4.example \
Custom.make.example \
Custom.m4.example \
plugin.rc.in
checkapi: