aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-04-15 23:40:36 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-18 03:46:17 +0000
commit4a156da068269aae75d79cd08e579754c52a0c43 (patch)
tree9637e57f0ceaaac66f6c47410c27054106d7d21a /doc
parent2e639570318018871e934fb7a397ba8a2bdcfbe8 (diff)
Remove autotools build system.
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am355
-rw-r--r--doc/README.dissector24
-rw-r--r--doc/README.idl2wrs1
-rw-r--r--doc/README.plugins71
-rw-r--r--doc/README.wslua9
-rw-r--r--doc/plugins.example/Makefile.am34
6 files changed, 14 insertions, 480 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index c88ebc7bc4..0000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,355 +0,0 @@
-# Makefile.am
-# Automake file for Wireshark documentation
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-
-# We include dependencies on ../config.h in order to
-# capture when $(VERSION) changes.
-
-#
-# This is a hideous hack.
-#
-# Automake needs to know into which sections to install various man
-# pages; if the names in "man_MANS" have suffixes, it can infer the
-# sections from the name (e.g., "hello.1" goes in section 1), but if
-# they don't have suffixes, it can't tell what sections to put them, and
-# it just gives up and doesn't create any rules to install them (and it
-# gives up silently, so you have no clue what's wrong).
-#
-# Therefore, we can't just set "man_MANS" to a list of variables to be
-# filled in by the configure script, as those variables don't have man
-# page section numbers.
-#
-# It turns out (although this is not documented anywhere I could find
-# in the automake Info file) that if you define, instead, variables with
-# names like "man{section}_MANS", automake will infer that the names in
-# those variables are the names of man pages to be installed in section
-# "{section}".
-#
-# So we define "man1_MANS" to contain all the section 1 man pages and
-# man4_MANS for the (one) section 4 man page.
-#
-# *However*, if "man_MANS" isn't defined at all, automake concludes that
-# there are no man pages, the fact that, say, "man1_MANS" is defined
-# nonwithstanding! (I suspect this is the result of a mistaken attempt
-# to get people to fix their automake files not to use "MANS"; if "MANS"
-# is defined, it prints a warning and sets the exit status, but doesn't
-# exit, and then it just gives up if "man_MANS" isn't defined,
-# presumably on the theory that the only reason it wouldn't be defined
-# is because the automake file uses the obsolete "MANS" variable instead
-# of the shiny new "man_MANS" variable.)
-#
-# So we also define "man_MANS", but don't define it as anything;
-# automake will arrange that the Makefile define it as the union of all
-# the "man{section}_MANS" variables.
-#
-man1_MANS = \
- @wireshark_man@ \
- @tshark_man@ \
- @text2pcap_man@ \
- @mergecap_man@ \
- @reordercap_man@ \
- @capinfos_man@ \
- @captype_man@ \
- @editcap_man@ \
- @dumpcap_man@ \
- @rawshark_man@ \
- @dftest_man@ \
- @randpkt_man@ \
- @androiddump_man@ \
- @ciscodump_man@ \
- @sshdump_man@ \
- @randpktdump_man@ \
- @udpdump_man@ \
- @mmdbresolve_man@
-
-man4_MANS = \
- @extcap_man@ \
- @wiresharkfilter_man@
-man_MANS =
-
-# Build these in case a developer wants to read them and for the Debian
-# development package.
-# (The former arguably should be in noinst_MANS but it didn't work for me.)
-noinst_DATA = asn2deb.1 asn2deb.html idl2deb.1 idl2deb.html idl2wrs.1 idl2wrs.html
-
-pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \
- tshark.html wireshark-filter.html capinfos.html captype.html ciscodump.html \
- editcap.html mergecap.html reordercap.html text2pcap.html dumpcap.html \
- androiddump.html sshdump.html randpktdump.html rawshark.html dftest.html \
- randpkt.html extcap.html udpdump.html mmdbresolve.html
-
-#
-# Build the short version of the authors file for the about dialog
-# Put a copy in the top-level directory so Help->About, when run from the
-# build directory, can find it.
-#
-AUTHORS-SHORT: $(top_srcdir)/AUTHORS $(srcdir)/make-authors-short.pl
- $(AM_V_GEN)$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl \
- < $(top_srcdir)/AUTHORS > AUTHORS-SHORT && \
- cp $@ $(top_builddir)
-
-#
-# Build the short version of the authors file with formatting codes for the
-# man page
-#
-AUTHORS-SHORT-FORMAT: AUTHORS-SHORT $(srcdir)/make-authors-format.pl
- $(AM_V_GEN)$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl \
- < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
-
-wireshark.pod: $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT
- $(AM_V_GEN)cat $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT > wireshark.pod
-
-AM_V_POD2MAN = $(am__v_POD2MAN_@AM_V@)
-am__v_POD2MAN_ = $(am__v_POD2MAN_@AM_DEFAULT_V@)
-am__v_POD2MAN_0 = @echo " POD2MAN " $@;
-
-AM_V_POD2HTML = $(am__v_POD2HTML_@AM_V@)
-am__v_POD2HTML_ = $(am__v_POD2HTML_@AM_DEFAULT_V@)
-am__v_POD2HTML_0 = @echo " POD2HTML" $@;
-
-POD_CSS_URL ?= $(top_srcdir)/docbook/ws.css
-
-.pod.1: ../config.h
- $(AM_V_POD2MAN)$(POD2MAN) \
- --center="The Wireshark Network Analyzer" \
- --release=$(VERSION) \
- $< > $@
-
-.pod.html: ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $< > $@
-
-# These rules need to stay separate because of the --section option.
-wireshark-filter.4: wireshark-filter.pod ../config.h
- $(AM_V_POD2MAN)$(POD2MAN) \
- --section=4 \
- --center="The Wireshark Network Analyzer" \
- --release=$(VERSION) \
- $(srcdir)/wireshark-filter.pod > wireshark-filter.4
-
-extcap.4: extcap.pod ../config.h
- $(AM_V_POD2MAN)$(POD2MAN) \
- --section=4 \
- --center="The Wireshark Network Analyzer" \
- --release=$(VERSION) \
- $(srcdir)/extcap.pod > extcap.4
-
-# These rules need to stay separate because each man page has a separate
-# title. Using GNU make's pattern rules would allow these to be removed
-# but at the cost of portability.
-tshark.html: tshark.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="tshark - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/tshark.pod > tshark.html
-
-wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/wireshark-filter.pod > wireshark-filter.html
-
-extcap.html: extcap.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="extcap - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/extcap.pod > extcap.html
-
-capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/capinfos.pod > capinfos.html
-
-captype.html: captype.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="captype - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/captype.pod > captype.html
-
-editcap.html: editcap.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="editcap - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/editcap.pod > editcap.html
-
-idl2wrs.html: idl2wrs.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/idl2wrs.pod > idl2wrs.html
-
-mergecap.html: mergecap.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/mergecap.pod > mergecap.html
-
-reordercap.html: reordercap.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="reordercap - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/reordercap.pod > reordercap.html
-
-text2pcap.html: text2pcap.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/text2pcap.pod > text2pcap.html
-
-dumpcap.html: dumpcap.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/dumpcap.pod > dumpcap.html
-
-androiddump.html: androiddump.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="androiddump - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/androiddump.pod > androiddump.html
-
-sshdump.html: sshdump.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="sshdump - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/sshdump.pod > sshdump.html
-
-ciscodump.html: ciscodump.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="ciscodump - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/ciscodump.pod > ciscodump.html
-
-randpktdump.html: randpktdump.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="randpktdump - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/randpktdump.pod > randpktdump.html
-
-rawshark.html: rawshark.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="rawshark - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/rawshark.pod > rawshark.html
-
-dftest.html: dftest.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="dftest - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/dftest.pod > dftest.html
-
-randpkt.html: randpkt.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="randpkt - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/randpkt.pod > randpkt.html
-
-udpdump.html: udpdump.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="udpdump - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/udpdump.pod > udpdump.html
-
-mmdbresolve.html: mmdbresolve.pod ../config.h $(top_srcdir)/docbook/ws.css
- $(AM_V_POD2HTML)$(POD2HTML) \
- --title="mmdbresolve - The Wireshark Network Analyzer $(VERSION)" \
- --css=$(POD_CSS_URL) \
- --noindex \
- $(srcdir)/mmdbresolve.pod > mmdbresolve.html
-
-CLEANFILES = \
- wireshark.pod \
- *.1 \
- *.4 \
- *.html
-
-DISTCLEANFILES = \
- pod2htmi.tmp \
- pod2htmd.tmp \
- AUTHORS-SHORT \
- ../AUTHORS-SHORT \
- AUTHORS-SHORT-FORMAT \
- *~
-
-EXTRA_DIST = \
- README.capture \
- README.design \
- README.developer \
- README.display_filter \
- README.dissector \
- README.extcap \
- README.heuristic \
- README.idl2wrs \
- README.packaging \
- README.plugins \
- README.regression \
- README.request_response_tracking\
- README.stats_tree \
- README.tapping \
- README.wmem \
- README.wslua \
- README.xml-output \
- androiddump.pod \
- asn2deb.pod \
- capinfos.pod \
- captype.pod \
- ciscodump.pod \
- dftest.pod \
- dumpcap.pod \
- editcap.pod \
- extcap.pod \
- idl2deb.pod \
- idl2wrs.pod \
- make-authors-format.pl \
- make-authors-short.pl \
- mergecap.pod \
- packet-PROTOABBREV.c \
- perlnoutf.pl \
- plugins.example/configure.ac \
- plugins.example/hello.c \
- plugins.example/Makefile.am \
- plugins.example/README \
- randpkt.pod \
- randpkt.txt \
- randpktdump.pod \
- rawshark.pod \
- reordercap.pod \
- sgml.doc.template \
- sshdump.pod \
- text2pcap.pod \
- tshark.pod \
- udpdump.pod \
- mmdbresolve.pod \
- wireshark-filter.pod \
- wireshark.pod.template \
- CMakeLists.txt
-
diff --git a/doc/README.dissector b/doc/README.dissector
index 70a6875d1b..1096588297 100644
--- a/doc/README.dissector
+++ b/doc/README.dissector
@@ -67,8 +67,7 @@ Usually, you will put your newly created dissector file into the directory
epan/dissectors/, just like all the other packet-*.c files already in there.
Also, please add your dissector file to the corresponding makefiles,
-described in section "1.8 Editing Makefile.am and CMakeLists.txt
-to add your dissector" below.
+described in section "1.8 Editing CMakeLists.txt to add your dissector" below.
Dissectors that use the dissector registration API to register with a lower
level protocol (this is the vast majority) don't need to define a prototype in
@@ -654,8 +653,7 @@ generated automatically; to arrange that a protocol's register routine
be called at startup:
the file containing a dissector's "register" routine must be
- added to "DISSECTOR_SRC" in "epan/dissectors/Makefile.am"
- (and in "epan/dissectors/CMakeLists.txt");
+ added to "DISSECTOR_SRC" in "epan/dissectors/CMakeLists.txt";
the "register" routine must have a name of the form
"proto_register_XXX";
@@ -2406,23 +2404,11 @@ This allows dissection of a packet to be expanded outside of dissector without
having to modify the dissector directly.
-1.8 Editing Makefile.am and CMakeLists.txt to add your dissector.
+1.8 Editing CMakeLists.txt to add your dissector.
To arrange that your dissector will be built as part of Wireshark, you
-must add the name of the source file for your dissector to the
-'DISSECTOR_SRC' macro in the 'Makefile.am' file in the 'epan/dissectors'
-directory. (Note that this is for modern versions of UNIX, so there
-is no 14-character limitation on file names, and for modern versions of
-Windows, so there is no 8.3-character limitation on file names.)
-
-If your dissector also has its own header file or files, you must add
-them to the 'DISSECTOR_INCLUDES' macro in the 'Makefile.am' file in
-the 'epan/dissectors' directory, so that it's included when release source
-tarballs are built (otherwise, the source in the release tarballs won't
-compile).
-
-In addition to the above, you should add your dissector source file name
-to the DISSECTOR_SRC section of epan/dissectors/CMakeLists.txt
+must add the name of the source file for your dissector to the DISSECTOR_SRC
+section of epan/dissectors/CMakeLists.txt
1.9 Using the git source code tree.
diff --git a/doc/README.idl2wrs b/doc/README.idl2wrs
index 02907e82a3..9d3e612c2f 100644
--- a/doc/README.idl2wrs
+++ b/doc/README.idl2wrs
@@ -96,7 +96,6 @@ steps 3 or 4 instead.
following files to include the packet-test-idl.c
cp packet-test-idl.c /dir/where/wireshark/lives/epan/dissectors/
- edit epan/dissectors/Makefile.am
edit epan/dissectors/CMakeLists.txt
6. Run configure
diff --git a/doc/README.plugins b/doc/README.plugins
index b8f716a3d2..d39d244461 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -29,7 +29,6 @@ The plugin should be placed in a new plugins/epan/foo directory which should
contain at least the following files:
CMakeLists.txt
-Makefile.am
README
The README can be brief but it should provide essential information relevant
@@ -46,20 +45,7 @@ For your plugins/epan/foo/CMakeLists.txt file, see the corresponding file in
plugins/epan/gryphon. Replace all occurrences of "gryphon" in those files
with "foo" and add your source files to the DISSECTOR_SRC variable.
-2.2 Makefile.am
-
-For your plugins/epan/foo/Makefile.am file, see the corresponding file in
-plugins/epan/gryphon. Replace all occurrences of "gryphon" in those files
-with "foo".
-
-Your plugins/epan/foo/Makefile.am also needs to list the main source file
-which exports plugin_register() for your dissector in the
-DISSECTOR_SRC variable. All other supporting source files should be
-listed in the DISSECTOR_SUPPORT_SRC variable.
-The header files for your dissector, if any, must be listed in the
-DISSECTOR_INCLUDES variable.
-
-2.4 plugin.rc.in
+2.2 plugin.rc.in
Your plugins/epan/foo/plugin.rc.in is the Windows resource template file used
to add the plugin specific information as resources to the DLL.
@@ -106,10 +92,7 @@ In order to be able to permanently add a plugin take the following steps.
You will need to change the following files:
configure.ac
CMakeLists.txt
- epan/Makefile.am
- Makefile.am
packaging/nsis/wireshark.nsi
- plugins/Makefile.am
You might also want to search your Wireshark development directory for
occurrences of an existing plugin name, in case this document is out of
@@ -119,49 +102,7 @@ date with the current directory structure. For example,
could be used from a shell prompt.
-3.2.1 Changes to plugins/Makefile.am
-
-The plugins directory contains a Makefile.am. You need to add to SUBDIRS
-(in alphabetical order) the name of your plugin:
-
-SUBDIRS = $(_CUSTOM_SUBDIRS_) \
- ...
- epan/ethercat \
- epan/foo \
- epan/gryphon \
- epan/irda \
-
-
-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
-
-AC_OUTPUT(
- ...
- plugins/epan/ethercat/Makefile
- plugins/epan/foo/Makefile
- plugins/epan/gryphon/Makefile
- plugins/epan/irda/Makefile
- ...
- ,)
-
-3.2.3 Changes to epan/Makefile.am
-
-Add the relative path of all your plugin source files (in alphbetical
-order) to plugin_src:
-
-plugin_src = \
- ...
- ../plugins/epan/ethercat/packet-ioraw.c \
- ../plugins/epan/ethercat/packet-nv.c \
- ../plugins/epan/foo/packet-foo.c \
- ../plugins/epan/gryphon/packet-gryphon.c \
- ../plugins/epan/irda/packet-ircomm.c \
- ../plugins/epan/irda/packet-irda.c \
- ...
-
-3.2.4 Changes to CMakeLists.txt
+3.2.1 Changes to CMakeLists.txt
Add your plugin (in alphabetical order) to the PLUGIN_SRC_DIRS:
@@ -175,12 +116,12 @@ if(ENABLE_PLUGINS)
plugins/epan/irda
...
-3.2.5 Changes to the installers
+3.2.2 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.5.1 Changes to packaging/nsis/wireshark.nsi
+3.2.2.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:
@@ -190,7 +131,7 @@ File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\foo.dll"
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\gryphon.dll"
File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\irda.dll"
-3.2.5.2 Other installers
+3.2.2.2 Other installers
The PortableApps installer copies plugins from the build directory
and should not require configuration.
@@ -303,8 +244,6 @@ is encouraged to update their plugins as outlined below:
o Remove the init function.
- o Change the Makefile.am file to match the one of the DOCSIS plugin.
-
6 How to plugin related interface options
To demonstrate the functionality of the plugin interface options, a
diff --git a/doc/README.wslua b/doc/README.wslua
index 738535c615..1bc10aead8 100644
--- a/doc/README.wslua
+++ b/doc/README.wslua
@@ -44,10 +44,9 @@ Lua tables. (you can do so, but it's not advisable)
Both of the perl scripts above are given the C-source files to search through
by the make process, generated from the lists in epan/wslua/CMakeLists.txt.
Naturally if you add new source files, you need to add them to the list in
-epan/wslua/CMakeLists.txt and epan/wslua/Makefile.am. You also have to add
-the module name into docbook/user-guide.xml and docbook/wsluarm.xml, and the
-source files into docbook/CMakeLists.txt and docbook/Makefile.am, to get
-it to be generated in the user guide.
+epan/wslua/CMakeLists.txt. You also have to add the module name into
+docbook/user-guide.xml and docbook/wsluarm.xml, and the source files into
+docbook/CMakeLists.txt, to get it to be generated in the user guide.
Another Perl script is used as well, called 'make-init-lua.pl', which
generates the init.lua script. A large part of it deals with exposing #define
@@ -309,7 +308,7 @@ WSLUA_CONTINUE_MODULE - like WSLUA_MODULE, except used at the top of a .c file
to continue defining classes/functions/etc. within a previously declared module
in a previous file (i.e., one that used WSLUA_MODULE). The module name must match
the original one, and the .c file must be listed after the original one in the
-CMakeLists.txt/Makefile.am lists in the docbook directory.
+CMakeLists.txt lists in the docbook directory.
WSLUA_ATTRIBUTE - this is another documentation-only "macro", only used within
diff --git a/doc/plugins.example/Makefile.am b/doc/plugins.example/Makefile.am
deleted file mode 100644
index 10abf565e8..0000000000
--- a/doc/plugins.example/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# Makefile.am
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-
-WARNFLAGS = -Wall -Wextra
-
-plugindir := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --define-variable=libdir=$(libdir) --variable plugindir wireshark)
-
-epan_plugindir = $(plugindir)/epan
-
-VERSION_RELEASE := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --variable VERSION_RELEASE wireshark)
-
-epan_plugin_LTLIBRARIES = hello.la
-
-hello_la_SOURCES = hello.c
-
-hello_la_CPPFLAGS = -DVERSION_RELEASE=\"$(VERSION_RELEASE)\"
-
-hello_la_CFLAGS = $(WIRESHARK_CFLAGS) -fvisibility=hidden $(WARNFLAGS)
-
-hello_la_LDFLAGS = -module -avoid-version -shared
-
-hello_la_LIBADD = $(WIRESHARK_LIBS)
-
-homedir = $${HOME}/.local/lib/wireshark/plugins/$(VERSION_RELEASE)/epan
-
-install-home:
- $(MKDIR_P) $(homedir) || exit 1; \
- $(INSTALL) $(builddir)/.libs/hello.so $(homedir)