aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-06-21 05:06:23 +0100
committerJoão Valverde <j@v6e.pt>2016-06-30 11:04:17 +0000
commita16d401b25c85ffb7fde6c46b51cb7048112f885 (patch)
tree71ba692edcdb6f2a10ed566e18bcfbbc456cfad1 /doc
parentf6c5cf953212248cbc680ef0d9b2f852cbfdb951 (diff)
Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'doc')
-rw-r--r--doc/README.dissector10
-rw-r--r--doc/README.idl2wrs4
-rw-r--r--doc/README.plugins12
-rw-r--r--doc/README.qt2
-rw-r--r--doc/README.wslua4
5 files changed, 13 insertions, 19 deletions
diff --git a/doc/README.dissector b/doc/README.dissector
index 7e41cc4b74..36367696ff 100644
--- a/doc/README.dissector
+++ b/doc/README.dissector
@@ -69,7 +69,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.common and CMakeLists.txt
+described in section "1.8 Editing Makefile.am and CMakeLists.txt
to add your dissector" below.
Dissectors that use the dissector registration API to register with a lower
@@ -627,7 +627,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.common"
+ added to "DISSECTOR_SRC" in "epan/dissectors/Makefile.am"
(and in "epan/dissectors/CMakeLists.txt");
the "register" routine must have a name of the form
@@ -2217,17 +2217,17 @@ This allows dissection of a packet to be expanded outside of dissector without
having to modify the dissector directly.
-1.8 Editing Makefile.common and CMakeLists.txt to add your dissector.
+1.8 Editing Makefile.am and 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.common' file in the 'epan/dissectors'
+'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.common' file in
+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).
diff --git a/doc/README.idl2wrs b/doc/README.idl2wrs
index af899b0f16..02907e82a3 100644
--- a/doc/README.idl2wrs
+++ b/doc/README.idl2wrs
@@ -96,8 +96,8 @@ 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.common
- edit epan/CMakeLists.txt
+ edit epan/dissectors/Makefile.am
+ edit epan/dissectors/CMakeLists.txt
6. Run configure
diff --git a/doc/README.plugins b/doc/README.plugins
index 5302cef56c..216814ce42 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -22,7 +22,6 @@ COPYING
ChangeLog
CMakeLists.txt
Makefile.am
-Makefile.common
moduleinfo.h
plugin.rc.in
@@ -47,9 +46,7 @@ For your plugins/foo/Makefile.am file, see the corresponding file in
plugins/gryphon. Replace all occurrences of "gryphon" in those files
with "foo".
-2.4 Makefile.common
-
-Your plugins/foo/Makefile.common should only list the main source file(s),
+Your plugins/foo/Makefile.am also needs to list the main source file(s),
which exports register_*() and handoff_*(), for your dissector in the
DISSECTOR_SRC variable. All other supporting source files should be
listed in the DISSECTOR_SUPPORT_SRC variable.
@@ -57,12 +54,12 @@ The header files for your dissector, if any, must be listed in the
DISSECTOR_INCLUDES variable. The DISSECTOR_INCLUDES variable should not
include moduleinfo.h.
-2.5 moduleinfo.h
+2.4 moduleinfo.h
Your plugins/foo/moduleinfo.h file is used to set the version information
for the plugin.
-2.6 plugin.rc.in
+2.5 plugin.rc.in
Your plugins/foo/plugin.rc.in is the Windows resource template file used
to add the plugin specific information as resources to the DLL.
@@ -288,9 +285,6 @@ is encouraged to update their plugins as outlined below:
o Remove the init function.
- o Add a new Makefile.common file with the lists of source files and
- headers.
-
o Change the Makefile.am file to match the one of the DOCSIS plugin.
diff --git a/doc/README.qt b/doc/README.qt
index 74b1457a08..d1c268de1c 100644
--- a/doc/README.qt
+++ b/doc/README.qt
@@ -184,7 +184,7 @@ https://www.wireshark.org/docs/wsdg_html_chunked/ChUIQt.html
Qt makes translating the Wireshark UI into different languages easy.
-- Add your translation (ui/qt/wireshark_XX.ts) in ui/qt/Makefile.common and ui/qt/CMakeLists.txt
+- Add your translation (ui/qt/wireshark_XX.ts) in ui/qt/Makefile.am and ui/qt/CMakeLists.txt
- Please add flag (image) for your language in images/languages/XX.svg and image/languages/languages.qrc
- Run "lupdate ui/qt -ts ui/qt/wireshark_XX.ts" to generate/update your translation file.
- Translate with Qt Linguist (in console: "linguist ui/qt/wireshark_XX.ts")
diff --git a/doc/README.wslua b/doc/README.wslua
index e1a02b3f01..7eea198165 100644
--- a/doc/README.wslua
+++ b/doc/README.wslua
@@ -46,7 +46,7 @@ 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.common, to get
+source files into docbook/CMakeLists.txt and docbook/Makefile.am, to get
it to be generated in the user guide.
Another Perl script is used as well, called 'make-init-lua.pl', which
@@ -293,7 +293,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.common lists in the docbook directory.
+CMakeLists.txt/Makefile.am lists in the docbook directory.
WSLUA_ATTRIBUTE - this is another documentation-only "macro", only used within