diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-04-15 23:40:36 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-04-18 03:46:17 +0000 |
commit | 4a156da068269aae75d79cd08e579754c52a0c43 (patch) | |
tree | 9637e57f0ceaaac66f6c47410c27054106d7d21a /docbook | |
parent | 2e639570318018871e934fb7a397ba8a2bdcfbe8 (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')
-rw-r--r-- | docbook/Makefile.am | 503 | ||||
-rw-r--r-- | docbook/wsdg_src/WSDG_chapter_dissection.asciidoc | 39 | ||||
-rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.asciidoc | 12 | ||||
-rw-r--r-- | docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc | 2 |
4 files changed, 29 insertions, 527 deletions
diff --git a/docbook/Makefile.am b/docbook/Makefile.am deleted file mode 100644 index c190d59817..0000000000 --- a/docbook/Makefile.am +++ /dev/null @@ -1,503 +0,0 @@ -# -# Make the "Wireshark User Guide" and "Wireshark Developer Guide" -# in several formats. -# See the README.adoc file for instructions. -# - -############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################ - -WSUG_FILES = \ - wsug_src/WSUG_app_files.asciidoc \ - wsug_src/WSUG_app_howitworks.asciidoc \ - wsug_src/WSUG_app_messages.asciidoc \ - wsug_src/WSUG_app_protocols.asciidoc \ - wsug_src/WSUG_app_tools.asciidoc \ - wsug_src/WSUG_chapter_advanced.asciidoc \ - wsug_src/WSUG_chapter_build_install.asciidoc \ - wsug_src/WSUG_chapter_capture.asciidoc \ - wsug_src/WSUG_chapter_customize.asciidoc \ - wsug_src/WSUG_chapter_introduction.asciidoc \ - wsug_src/WSUG_chapter_io.asciidoc \ - wsug_src/WSUG_chapter_statistics.asciidoc \ - wsug_src/WSUG_chapter_telephony.asciidoc \ - wsug_src/WSUG_chapter_troubleshoot.asciidoc \ - wsug_src/WSUG_chapter_use.asciidoc \ - wsug_src/WSUG_chapter_work.asciidoc \ - wsug_src/WSUG_preface.asciidoc \ - ws.css - -WSUG_TOOLS_HELP_FILES = \ - wsug_src/capinfos-h.txt \ - wsug_src/dumpcap-h.txt \ - wsug_src/editcap-F.txt \ - wsug_src/editcap-T.txt \ - wsug_src/editcap-h.txt \ - wsug_src/mergecap-h.txt \ - wsug_src/rawshark-h.txt \ - wsug_src/reordercap-h.txt \ - wsug_src/text2pcap-h.txt \ - wsug_src/tshark-h.txt - -WSUG_GENERATED_SOURCE = \ - user-guide.xml - -WSUG_GRAPHICS = \ - wsug_graphics/captureOptions.png \ - wsug_graphics/related-ack.png \ - wsug_graphics/related-dup-ack.png \ - wsug_graphics/related-last.png \ - wsug_graphics/related-request.png \ - wsug_graphics/related-segment.png \ - wsug_graphics/related-current.png \ - wsug_graphics/related-first.png \ - wsug_graphics/related-other.png \ - wsug_graphics/related-response.png \ - wsug_graphics/ws-analyze-menu.png \ - wsug_graphics/ws-bytes-pane-tabs.png \ - wsug_graphics/ws-bytes-pane.png \ - wsug_graphics/ws-capture-info.png \ - wsug_graphics/ws-capture-interfaces.png \ - wsug_graphics/ws-capture-interface-details.png \ - wsug_graphics/ws-capture-interfaces-win32.png \ - wsug_graphics/ws-capture-menu.png \ - wsug_graphics/ws-capture-options.png \ - wsug_graphics/ws-capture-options-compile-selected-bpfs.png \ - wsug_graphics/ws-capture-options-output.png \ - wsug_graphics/ws-capture-options-manage-interfaces-local.png \ - wsug_graphics/ws-capture-options-manage-interfaces-pipes.png \ - wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png \ - wsug_graphics/ws-capture-options-manage-interfaces-remote.png \ - wsug_graphics/ws-capture-options-manage-interfaces.png \ - wsug_graphics/ws-capture-options-remote-capture.png \ - wsug_graphics/ws-capture-options-remote-interface.png \ - wsug_graphics/ws-capture-options-remote-settings.png \ - wsug_graphics/ws-capture-options-settings.png \ - wsug_graphics/ws-capture-preferences.png \ - wsug_graphics/ws-choose-color-rule.png \ - wsug_graphics/ws-coloring-fields.png \ - wsug_graphics/ws-coloring-rules-dialog.png \ - wsug_graphics/ws-column-header-popup-menu.png \ - wsug_graphics/ws-decode-as-show.png \ - wsug_graphics/ws-decode-as.png \ - wsug_graphics/ws-details-pane-popup-menu.png \ - wsug_graphics/ws-details-pane.png \ - wsug_graphics/ws-display-filter-tcp.png \ - wsug_graphics/ws-edit-menu.png \ - wsug_graphics/ws-enabled-protocols.png \ - wsug_graphics/ws-expert-colored-tree.png \ - wsug_graphics/ws-expert-column.png \ - wsug_graphics/ws-expert-infos.png \ - wsug_graphics/ws-export-objects.png \ - wsug_graphics/ws-export-pdml.png \ - wsug_graphics/ws-export-plain.png \ - wsug_graphics/ws-export-ps.png \ - wsug_graphics/ws-export-psml.png \ - wsug_graphics/ws-export-selected.png \ - wsug_graphics/ws-file-import.png \ - wsug_graphics/ws-file-menu.png \ - wsug_graphics/ws-file-set-dialog.png \ - wsug_graphics/ws-filter-add-expression.png \ - wsug_graphics/ws-filter-toolbar.png \ - wsug_graphics/ws-filters.png \ - wsug_graphics/ws-find-packet.png \ - wsug_graphics/ws-follow-stream.png \ - wsug_graphics/ws-go-menu.png \ - wsug_graphics/ws-goto-packet.png \ - wsug_graphics/ws-gui-colors-preferences.png \ - wsug_graphics/ws-gui-columns-preferences.png \ - wsug_graphics/ws-gui-config-profiles.png \ - wsug_graphics/ws-gui-font-preferences.png \ - wsug_graphics/ws-gui-interface-options.png \ - wsug_graphics/ws-gui-layout-preferences.png \ - wsug_graphics/ws-gui-preferences.png \ - wsug_graphics/ws-help-menu.png \ - wsug_graphics/ws-internals-menu.png \ - wsug_graphics/ws-list-pane.png \ - wsug_graphics/ws-logo.png \ - wsug_graphics/ws-main-toolbar.png \ - wsug_graphics/ws-main.png \ - wsug_graphics/ws-menu.png \ - wsug_graphics/ws-merge-gtk24.png \ - wsug_graphics/ws-merge-win32.png \ - wsug_graphics/ws-nameresolution-preferences.png \ - wsug_graphics/ws-open-gtk24.png \ - wsug_graphics/ws-open-win32.png \ - wsug_graphics/ws-packet-format.png \ - wsug_graphics/ws-packet-pane-popup-menu.png \ - wsug_graphics/ws-packet-range.png \ - wsug_graphics/ws-packet-selected.png \ - wsug_graphics/ws-packet-sep-win.png \ - wsug_graphics/ws-print.png \ - wsug_graphics/ws-printing-preferences.png \ - wsug_graphics/ws-save-as-gtk24.png \ - wsug_graphics/ws-save-as-win32.png \ - wsug_graphics/ws-statistics-menu.png \ - wsug_graphics/ws-stats-compare.png \ - wsug_graphics/ws-stats-conversations.png \ - wsug_graphics/ws-stats-endpoints.png \ - wsug_graphics/ws-stats-hierarchy.png \ - wsug_graphics/ws-stats-iographs.png \ - wsug_graphics/ws-stats-srt-dcerpc-filter.png \ - wsug_graphics/ws-stats-srt-dcerpc.png \ - wsug_graphics/ws-stats-summary.png \ - wsug_graphics/ws-stats-lte-mac-traffic.png \ - wsug_graphics/ws-stats-lte-rlc-traffic.png \ - wsug_graphics/ws-stats-wlan-traffic.png \ - wsug_graphics/ws-statusbar-empty.png \ - wsug_graphics/ws-statusbar-filter.png \ - wsug_graphics/ws-statusbar-loaded.png \ - wsug_graphics/ws-statusbar-profile.png \ - wsug_graphics/ws-statusbar-selected.png \ - wsug_graphics/ws-tel-rtpstream-analysis.png \ - wsug_graphics/ws-telephony-menu.png \ - wsug_graphics/ws-tools-menu.png \ - wsug_graphics/ws-time-reference.png \ - wsug_graphics/ws-view-menu.png \ - wsug_graphics/toolbar/autoscroll_24.png \ - wsug_graphics/toolbar/capture_filter_24.png \ - wsug_graphics/toolbar/capture_interfaces_24.png \ - wsug_graphics/toolbar/capture_options_24.png \ - wsug_graphics/toolbar/capture_restart_24.png \ - wsug_graphics/toolbar/capture_start_24.png \ - wsug_graphics/toolbar/capture_stop_24.png \ - wsug_graphics/toolbar/colorize_24.png \ - wsug_graphics/toolbar/display_filter_24.png \ - wsug_graphics/toolbar/resize_columns_24.png \ - wsug_graphics/toolbar/stock_add_24.png \ - wsug_graphics/toolbar/stock_apply_20.png \ - wsug_graphics/toolbar/stock_bottom_24.png \ - wsug_graphics/toolbar/stock_clear_24.png \ - wsug_graphics/toolbar/stock_close_24.png \ - wsug_graphics/toolbar/stock_colorselector_24.png \ - wsug_graphics/toolbar/stock_help_24.png \ - wsug_graphics/toolbar/stock_jump_to_24.png \ - wsug_graphics/toolbar/stock_left_arrow_24.png \ - wsug_graphics/toolbar/stock_open_24.png \ - wsug_graphics/toolbar/stock_preferences_24.png \ - wsug_graphics/toolbar/stock_print_24.png \ - wsug_graphics/toolbar/stock_properties_24.png \ - wsug_graphics/toolbar/stock_refresh_24.png \ - wsug_graphics/toolbar/stock_right_arrow_24.png \ - wsug_graphics/toolbar/stock_save_24.png \ - wsug_graphics/toolbar/stock_save_as_24.png \ - wsug_graphics/toolbar/stock_search_24.png \ - wsug_graphics/toolbar/stock_stop_24.png \ - wsug_graphics/toolbar/stock_top_24.png \ - wsug_graphics/toolbar/stock_zoom_1_24.png \ - wsug_graphics/toolbar/stock_zoom_in_24.png \ - wsug_graphics/toolbar/stock_zoom_out_24.png - -WSDG_FILES = \ - wsdg_src/WSDG_chapter_build_intro.asciidoc \ - wsdg_src/WSDG_chapter_capture.asciidoc \ - wsdg_src/WSDG_chapter_dissection.asciidoc \ - wsdg_src/WSDG_chapter_env_intro.asciidoc \ - wsdg_src/WSDG_chapter_libraries.asciidoc \ - wsdg_src/WSDG_chapter_quick_setup.asciidoc \ - wsdg_src/WSDG_chapter_sources.asciidoc \ - wsdg_src/WSDG_chapter_tools.asciidoc \ - wsdg_src/WSDG_chapter_userinterface.asciidoc \ - wsdg_src/WSDG_chapter_works.asciidoc \ - wsdg_src/WSDG_preface.asciidoc \ - wsluarm.asciidoc \ - ws.css - -WSDG_GENERATED_SOURCE = \ - developer-guide.xml - -WSDG_GRAPHICS = \ - wsdg_graphics/ws-capture-sync.dia \ - wsdg_graphics/ws-capture-sync.png \ - wsdg_graphics/ws-capture_internals.dia \ - wsdg_graphics/ws-capture_internals.png \ - wsdg_graphics/ws-function-blocks.dia \ - wsdg_graphics/ws-function-blocks.png \ - wsdg_graphics/ws-logo.png \ - wsdg_graphics/toolbar/dummy.dummy - -COMMON_FILES = \ - common_src/GPL_appendix.asciidoc \ - common_src/typographic_conventions.asciidoc - -COMMON_GRAPHICS = \ - common_graphics/note.svg \ - common_graphics/tip.svg \ - common_graphics/warning.svg - -# user-guide.xml must be first in the list (to match $<) -WSUG_DIST = \ - user-guide.asciidoc \ - attributes.asciidoc \ - custom_layer_chm.xsl \ - custom_layer_single_html.xsl \ - $(WSUG_FILES) \ - $(WSUG_TOOLS_HELP_FILES) \ - $(WSUG_GRAPHICS) \ - $(COMMON_FILES) \ - $(COMMON_GRAPHICS) - -WSUG_SOURCE = $(WSUG_GENERATED_SOURCE) $(WSUG_DIST) - -# developer-guide.asciidoc must be first in the list (to match $<) -WSDG_DIST = \ - developer-guide.asciidoc \ - attributes.asciidoc \ - custom_layer_chm.xsl \ - custom_layer_single_html.xsl \ - $(WSDG_FILES) \ - $(WSDG_GRAPHICS) \ - $(COMMON_FILES) \ - $(COMMON_GRAPHICS) - -WSDG_SOURCE = $(WSDG_GENERATED_SOURCE) $(WSDG_DIST) - -RELEASE_NOTES_SOURCE = \ - release-notes.asciidoc - -CLEANFILES = \ - *.chm \ - *.fo \ - *.hhc \ - *.hhp \ - *.pdf \ - $(WSDG_GENERATED_SOURCE) \ - $(WSUG_GENERATED_SOURCE) \ - wsdg_chm \ - wsdg_html.zip \ - wsdg_html_chunked.zip \ - wsug_chm \ - wsug_html.zip \ - wsug_html_chunked.zip \ - htmlhelp.* \ - release_notes_chm \ - release-notes.html \ - release-notes.txt \ - user-guide.zip \ - wsluarm - -CLEANDIRS = \ - wsdg_html \ - wsdg_html_chunked \ - wsug_html \ - wsug_html_chunked \ - wsluarm_src - -# Note: file order here MATTERS! -# new WSLUA_MODULE files must come right before any WSLUA_CONTINUE_MODULE -# files for the same module -WSLUA_MODULES = \ - $(top_srcdir)/epan/wslua/wslua_dumper.c \ - $(top_srcdir)/epan/wslua/wslua_field.c \ - $(top_srcdir)/epan/wslua/wslua_gui.c \ - $(top_srcdir)/epan/wslua/wslua_listener.c \ - $(top_srcdir)/epan/wslua/wslua_pinfo.c \ - $(top_srcdir)/epan/wslua/wslua_address.c \ - $(top_srcdir)/epan/wslua/wslua_column.c \ - $(top_srcdir)/epan/wslua/wslua_nstime.c \ - $(top_srcdir)/epan/wslua/wslua_proto.c \ - $(top_srcdir)/epan/wslua/wslua_dissector.c \ - $(top_srcdir)/epan/wslua/wslua_pref.c \ - $(top_srcdir)/epan/wslua/wslua_proto_expert.c \ - $(top_srcdir)/epan/wslua/wslua_proto_field.c \ - $(top_srcdir)/epan/wslua/wslua_int64.c \ - $(top_srcdir)/epan/wslua/wslua_struct.c \ - $(top_srcdir)/epan/wslua/wslua_tree.c \ - $(top_srcdir)/epan/wslua/wslua_tvb.c \ - $(top_srcdir)/epan/wslua/wslua_byte_array.c \ - $(top_srcdir)/epan/wslua/wslua_file.c \ - $(top_srcdir)/epan/wslua/wslua_file_handler.c \ - $(top_srcdir)/epan/wslua/wslua_frame_info.c \ - $(top_srcdir)/epan/wslua/wslua_capture_info.c \ - $(top_srcdir)/epan/wslua/wslua_dir.c \ - $(top_srcdir)/epan/wslua/wslua_util.c - -COMMON_XSLTPROC_ARGS = \ - --stringparam use.id.as.filename 1 \ - --stringparam admon.graphics 1 \ - --stringparam admon.graphics.extension .svg \ - --stringparam section.autolabel 1 \ - --stringparam section.label.includes.component.label 1 \ - --stringparam html.stylesheet ws.css - -WSUG_XSLTPROC_ARGS = \ - --stringparam admon.graphics.path wsug_graphics/ - -WSDG_XSLTPROC_ARGS = \ - --stringparam admon.graphics.path wsdg_graphics/ - -SINGLE_XSLTPROC_ARGS = \ - --nonet custom_layer_single_html.xsl - -CHUNKED_XSLTPROC_ARGS = \ - --stringparam chunker.output.encoding UTF-8 \ - --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl - -HTMLHELP_XSLTPROC_ARGS = \ - --nonet custom_layer_chm.xsl -# --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl - -ASCIIDOCTOR_COMMON_ARGS = \ - --require $(srcdir)/asciidoctor-macros/commaize-block.rb \ - --require $(srcdir)/asciidoctor-macros/cve_idlink-inline-macro.rb \ - --require $(srcdir)/asciidoctor-macros/ws_buglink-inline-macro.rb \ - --require $(srcdir)/asciidoctor-macros/ws_salink-inline-macro.rb - -ASCIIDOCTOR_COMMON_COMMAND = TZ=UTC ASCIIDOCTORJ_OPTS="-Xmx800m ${ASCIIDOCTORJ_OPTS}" \ - $(ASCIIDOCTOR) \ - $(ASCIIDOCTOR_COMMON_ARGS) - -.asciidoc.pdf: - $(ASCIIDOCTOR_COMMON_COMMAND) --backend pdf --out-file $@ $< - -.asciidoc.xml: - $(ASCIIDOCTOR_COMMON_COMMAND) --backend docbook --out-file $@ $< - -docbook_all_local_targets = -if BUILD_USER_GUIDE -docbook_all_local_targets += wsug_html_chunked - -all-local: $(docbook_all_local_targets) - -all-html: wsug wsdg release_notes - -all-pdf: wsug_pdf wsdg_pdf - -# Wireshark User Guide -wsug: wsug_html_chunked wsug_html - -wsug_pdf: wsug user-guide.pdf - -user-guide.xml: user-guide.asciidoc $(WSUG_FILES) - -user-guide.pdf: user-guide.asciidoc $(WSUG_FILES) -endif - -# create html single page file -if BUILD_USER_GUIDE -wsug_html: wsug_html/index.html -endif - -wsug_html/index.html: user-guide.xml - @ echo --- WSUG - HTML SINGLE PAGE --- - mkdir -p wsug_html/wsug_graphics/toolbar - cp $(srcdir)/wsug_graphics/*.* wsug_html/wsug_graphics - cp $(srcdir)/common_graphics/*.* wsug_html/wsug_graphics - cp $(srcdir)/wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar - cp $(srcdir)/ws.css wsug_html - $(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \ - $(WSUG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) $< > $@ - -chmod -R og+rX wsug_html - -# create html chunked page files -if BUILD_USER_GUIDE -wsug_html_chunked: wsug_html_chunked/index.html -endif - -wsug_html_chunked/index.html: user-guide.xml - @ echo --- WSUG - HTML CHUNKED --- - mkdir -p wsug_html_chunked/wsug_graphics/toolbar - cp $(srcdir)/wsug_graphics/*.* wsug_html_chunked/wsug_graphics - cp $(srcdir)/common_graphics/*.* wsug_html_chunked/wsug_graphics - cp $(srcdir)/wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar - cp $(srcdir)/ws.css wsug_html_chunked - $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ - $(WSUG_XSLTPROC_ARGS) $(CHUNKED_XSLTPROC_ARGS) $< - -chmod -R og+rX wsug_html_chunked - -wsluarm: make-wsluarm.pl $(WSLUA_MODULES) - mkdir -p wsluarm_src - $(PERL) $(srcdir)/make-wsluarm.pl $(WSLUA_MODULES) - touch wsluarm - - -# Wireshark Developer Guide -wsdg: wsdg_html_chunked wsdg_html - -if BUILD_USER_GUIDE -wsdg_pdf: developer-guide.pdf -endif - -developer-guide.xml: developer-guide.asciidoc $(WSDG_FILES) wsluarm - -developer-guide.pdf: developer-guide.asciidoc $(WSDG_FILES) wsluarm - -# create html single page file -if BUILD_USER_GUIDE -wsdg_html: wsdg_html/index.html -endif - -wsdg_html/index.html: developer-guide.xml - @ echo --- WSDG - HTML SINGLE PAGE --- - mkdir -p wsdg_html/wsdg_graphics/toolbar - cp $(srcdir)/wsdg_graphics/*.* wsdg_html/wsdg_graphics - cp $(srcdir)/common_graphics/*.* wsdg_html/wsdg_graphics - cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/ - cp $(srcdir)/ws.css wsdg_html - $(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \ - --path .:wsluarm_src \ - $(WSDG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) $< > $@ - -chmod -R og+rX wsdg_html - -# create html chunked page files -if BUILD_USER_GUIDE -wsdg_html_chunked: developer-guide.xml wsdg_html_chunked/index.html -endif - -wsdg_html_chunked/index.html: developer-guide.xml - @ echo --- WSDG - HTML CHUNKED --- - mkdir -p wsdg_html_chunked/wsdg_graphics/toolbar - cp $(srcdir)/wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics - cp $(srcdir)/common_graphics/*.* wsdg_html_chunked/wsdg_graphics - cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/ - cp $(srcdir)/ws.css wsdg_html_chunked - $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ - --path .:wsluarm_src \ - $(WSDG_XSLTPROC_ARGS) $(CHUNKED_XSLTPROC_ARGS) $< - -chmod -R og+rX wsdg_html_chunked - -# Release notes -if HAVE_ASCIIDOCTOR -release_note_deps = release-notes.html -release_note_deps += release-notes.txt -endif -release_notes: $(release_note_deps) - -# create html single page file -release-notes.html: $(RELEASE_NOTES_SOURCE) - @ echo --- RELEASE NOTES - HTML --- - $(ASCIIDOCTOR_COMMON_COMMAND) \ - --backend html \ - --out-file $(builddir)/release-notes.html \ - $(srcdir)/release-notes.asciidoc - -# create txt single page file (through HTML) -release-notes.txt: release-notes.html - @ echo --- RELEASE NOTES - TXT --- - $(PYTHON) $(srcdir)/tools/html2text.py \ - $(builddir)/release-notes.html \ - > $(builddir)/release-notes.txt - -news: release-notes.txt - cp release-notes.txt ../NEWS - -cp release-notes.txt $(top_srcdir)/NEWS - -install-data-local: -if BUILD_USER_GUIDE - $(MKDIR_P) $(DESTDIR)$(docdir)/guides - cp -rf $(builddir)/wsug_html_chunked $(DESTDIR)$(docdir)/guides -endif - -uninstall-local: - rm -rf $(DESTDIR)$(docdir) - -clean-local: - -rm -rf $(CLEANDIRS) - -EXTRA_DIST = \ - $(WSUG_DIST) \ - $(WSDG_DIST) \ - asciidoctor-macros \ - $(RELEASE_NOTES_SOURCE) \ - make-wsluarm.pl \ - README.adoc \ - CMakeLists.txt 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`. |