Sync some CMake and Autotools install behaviors.

Adjust the following CMake and Autotools behaviors in order to
synchronize their respective install behaviors:

- Disable tfshark by default in CMakeOptions.txt
- Add profiles/Bluetooth/preferences to Makefile.am
- Add missing captype and ciscodump entries to doc/Makefile.am
- Install help/faq.txt on all platforms in CMakeLists.txt
- Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb
  options to CMake and use them to adjust the corresponding parts
  of the build.
- Pull the DCERPC idl2wrs build steps into the top-level
  CMakeLists.txt.

This change doesn't sync everything. Some installed content still
diverges, including the following:

- CMake installs a bunch of modules into lib/wireshark:
    FindGLIB2.cmake
    FindWireshark.cmake
    FindWSWinLibs.cmake
    LocatePythonModule.cmake
    UseAsn2Wrs.cmake
    UseMakeDissectorReg.cmake
    WiresharkConfig.cmake
    WiresharkConfigVersion.cmake

  Do we need any or all of these? If so, should the Autotools behavior
  be synced accordingly?

- Autotools installs libtool .la files. It also installs
  wireshark-gtk.desktop unconditionally.

Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22
Reviewed-on: https://code.wireshark.org/review/23041
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

2 files changed, 41 insertions, 13 deletions

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index cbb2f5bdd3..ef0e90a2e1 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -70,15 +70,12 @@ else()
 endif()
 
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/androiddump 1)
-pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/asn2deb     1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/udpdump     1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/capinfos    1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/captype     1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/dftest      1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/dumpcap     1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/editcap     1)
-pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/idl2deb     1)
-pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/idl2wrs     1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/mergecap    1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/randpkt     1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/randpktdump 1)
@@ -93,8 +90,15 @@ pod2manhtml(${CMAKE_CURRENT_BINARY_DIR}/wireshark   1)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/extcap           4)
 pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/wireshark-filter 4)
 
+if (BUILD_corbaidl2wrs)
+	pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/idl2wrs     1)
+endif()
+if (BUILD_xxx2deb)
+	pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/asn2deb     1)
+	pod2manhtml(${CMAKE_CURRENT_SOURCE_DIR}/idl2deb     1)
+endif()
+
 set(MAN1_INSTALL_FILES
-	${CMAKE_CURRENT_BINARY_DIR}/asn2deb.1
 	${CMAKE_CURRENT_BINARY_DIR}/androiddump.1
 	${CMAKE_CURRENT_BINARY_DIR}/udpdump.1
 	${CMAKE_CURRENT_BINARY_DIR}/capinfos.1
@@ -103,8 +107,6 @@ set(MAN1_INSTALL_FILES
 	${CMAKE_CURRENT_BINARY_DIR}/dftest.1
 	${CMAKE_CURRENT_BINARY_DIR}/dumpcap.1
 	${CMAKE_CURRENT_BINARY_DIR}/editcap.1
-	${CMAKE_CURRENT_BINARY_DIR}/idl2deb.1
-	${CMAKE_CURRENT_BINARY_DIR}/idl2wrs.1
 	${CMAKE_CURRENT_BINARY_DIR}/mergecap.1
 	${CMAKE_CURRENT_BINARY_DIR}/randpkt.1
 	${CMAKE_CURRENT_BINARY_DIR}/randpktdump.1
@@ -117,6 +119,16 @@ set(MAN1_INSTALL_FILES
 	${CMAKE_CURRENT_BINARY_DIR}/wireshark.1
 )
 
+if (BUILD_corbaidl2wrs)
+	list(APPEND MAN1_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/idl2wrs.1)
+endif()
+if (BUILD_xxx2deb)
+	list(APPEND MAN1_INSTALL_FILES
+		${CMAKE_CURRENT_BINARY_DIR}/asn2deb.1
+		${CMAKE_CURRENT_BINARY_DIR}/idl2deb.1
+	)
+endif()
+
 set(MAN4_INSTALL_FILES
 	${CMAKE_CURRENT_BINARY_DIR}/extcap.4
 	${CMAKE_CURRENT_BINARY_DIR}/wireshark-filter.4
@@ -131,7 +143,6 @@ add_custom_target(manpages DEPENDS
 )
 
 set(HTML_INSTALL_FILES
-	${CMAKE_CURRENT_BINARY_DIR}/asn2deb.html
 	${CMAKE_CURRENT_BINARY_DIR}/androiddump.html
 	${CMAKE_CURRENT_BINARY_DIR}/udpdump.html
 	${CMAKE_CURRENT_BINARY_DIR}/capinfos.html
@@ -141,8 +152,6 @@ set(HTML_INSTALL_FILES
 	${CMAKE_CURRENT_BINARY_DIR}/dumpcap.html
 	${CMAKE_CURRENT_BINARY_DIR}/editcap.html
 	${CMAKE_CURRENT_BINARY_DIR}/extcap.html
-	${CMAKE_CURRENT_BINARY_DIR}/idl2deb.html
-	${CMAKE_CURRENT_BINARY_DIR}/idl2wrs.html
 	${CMAKE_CURRENT_BINARY_DIR}/mergecap.html
 	${CMAKE_CURRENT_BINARY_DIR}/randpkt.html
 	${CMAKE_CURRENT_BINARY_DIR}/randpktdump.html
@@ -156,6 +165,16 @@ set(HTML_INSTALL_FILES
 	${CMAKE_CURRENT_BINARY_DIR}/wireshark-filter.html
 )
 
+if (BUILD_corbaidl2wrs)
+	list(APPEND HTML_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/idl2wrs.html)
+endif()
+if (BUILD_xxx2deb)
+	list(APPEND HTML_INSTALL_FILES
+		${CMAKE_CURRENT_BINARY_DIR}/asn2deb.html
+		${CMAKE_CURRENT_BINARY_DIR}/idl2deb.html
+	)
+endif()
+
 add_custom_target(
 	docs ALL
 	DEPENDS
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c71b3479e6..89ae792b5c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -66,12 +66,14 @@ man1_MANS = \
 	@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@
@@ -87,10 +89,10 @@ man_MANS =
 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 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
+	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
 
 #
 # Build the short version of the authors file for the about dialog
@@ -182,6 +184,13 @@ capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--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)"	\