aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsdg_src
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 /docbook/wsdg_src
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 'docbook/wsdg_src')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_dissection.asciidoc39
-rw-r--r--docbook/wsdg_src/WSDG_chapter_sources.asciidoc12
-rw-r--r--docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc2
3 files changed, 29 insertions, 24 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc b/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
index a7b9905c44..8391e19176 100644
--- a/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
@@ -168,8 +168,6 @@ It doesn't do much at present, other than identify the protocol and label it.
In order to compile this dissector and create a plugin a couple of support files
are required, besides the dissector source in _packet-foo.c_:
-* _Makefile.am_ - The UNIX/Linux makefile template.
-
* _CMakeLists.txt_ - Contains the CMake file and version info for this plugin.
* _packet-foo.c_ - Your dissector source.
@@ -177,9 +175,8 @@ are required, besides the dissector source in _packet-foo.c_:
* _plugin.rc.in_ - Contains the DLL resource template for Windows. (optional)
You can find a good example for these files in the gryphon plugin directory.
-_Makefile.am_ has to be modified to reflect the relevant files and dissector
-name. _CMakeLists.txt_ has to be modified with the correct
-plugin name and version info, along with the relevant files to compile.
+_CMakeLists.txt_ has to be modified with the correct plugin name and version
+info, along with the relevant files to compile.
In the main top-level source directory, copy CMakeListsCustom.txt.example to
CMakeListsCustom.txt and add the path of your plugin to the list in
CUSTOM_PLUGIN_SRC_DIR.
@@ -1250,39 +1247,47 @@ Wireshark source directory.
$ cp packet-test-idl.c /dir/where/wireshark/lives/epan/dissectors/
----
-The new dissector has to be added to Makefile.am in the same directory. Look
-for the declaration CLEAN_DISSECTOR_SRC and add the new dissector there. For
+The new dissector has to be added to CMakeLists.txt in the same directory. Look
+for the declaration DISSECTOR_SRC and add the new dissector there. For
example,
----
-CLEAN_DISSECTOR_SRC = \
- packet-2dparityfec.c \
- packet-3com-njack.c \
+DISSECTOR_SRC = \
+ ${CMAKE_CURRENT_SOURCE_DIR}/packet-2dparityfec.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/packet-3com-njack.c
...
----
becomes
----
-CLEAN_DISSECTOR_SRC = \
- packet-test-idl.c \
- packet-2dparityfec.c \
- packet-3com-njack.c \
+DISSECTOR_SRC = \
+ ${CMAKE_CURRENT_SOURCE_DIR}/packet-test-idl.c \
+ ${CMAKE_CURRENT_SOURCE_DIR}/packet-2dparityfec.c \
+ ${CMAKE_CURRENT_SOURCE_DIR}/packet-3com-njack.c \
...
----
--
For the next steps, go up to the top of your Wireshark source directory.
-* Run configure
+* Create a build dir
++
+--
+----
+$ mkdir build && cd build
+----
+--
+
+* Run cmake
+
--
----
-$ ./configure (or ./autogen.sh)
+$ cmake ..
----
--
-* Compile the code
+* Build the code
+
--
----
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 5422fcdd30..bc8d9cbb46 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -975,12 +975,12 @@ directory, you’d run `patch` in _that_ directory and run it with `-p0`.
If you run it without `-pat` all, the patch tool
flattens path names, so that if you
-have a patch file with patches to _Makefile.am_ and
-_wiretap/Makefile.am_,
+have a patch file with patches to _CMakeLists.txt_ and
+_wiretap/CMakeLists.txt_,
it'll try to apply the first patch to the top-level
-_Makefile.am_ and then apply the
-_wiretap/Makefile.am_ patch to the top-level
-_Makefile.am_ as well.
+_CMakeLists.txt_ and then apply the
+_wiretap/CMakeLists.txt_ patch to the top-level
+_CMakeLists.txt_ as well.
At which position in the filesystem should the patch tool be called?
@@ -993,7 +993,7 @@ if somebody did a patch to _packet-ip.c_ and ran `diff` or `git diff` in
the _epan/dissectors_ directory -- you’d run it in that subdirectory.
It is preferred that people *not* submit patches like
that, especially if they're only patching files that exist in multiple
-directories such as _Makefile.am_.
+directories such as _CMakeLists.txt_.
[[ChSrcBinary]]
diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
index 363393ffd8..9abc369d91 100644
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
@@ -206,7 +206,7 @@ In most cases you should handle the changeEvent in order to catch
Qt makes translating the Wireshark UI into different languages easy. To add a new
translation, do the following:
-- Add your translation (_ui/qt/wireshark_XX.ts_) to _ui/qt/Makefile.am_ and _ui/qt/CMakeLists.txt_
+- Add your translation (_ui/qt/wireshark_XX.ts_) to _ui/qt/CMakeLists.txt_
- (Recommended) Add a flag image for your language in _images/languages/XX.svg_. Update _image/languages/languages.qrc_ accordingly.
- Run `lupdate ui/qt -ts ui/qt/wireshark_XX.ts` to generate/update your translation file.
- Translate with Qt Linguist: `linguist ui/qt/wireshark_XX.ts`.