Install libwiretap and libwscodecs headers

Change-Id: Ie7376ac5fd8a950e3c1c744ce4701b14ee1849ea
Reviewed-on: https://code.wireshark.org/review/23664
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>

5 files changed, 43 insertions, 9 deletions

diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index 9c47ff69d0..ba2e263505 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -19,6 +19,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+set(WSCODECS_PUBLIC_HEADERS
+  codecs.h
+)
+
 set(WSCODECS_FILES
   codecs.c
   G711a/G711adecode.c
@@ -87,6 +91,12 @@ if(NOT ${ENABLE_STATIC})
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
+
+  if(NOT WIN32)
+    install(FILES ${WSCODECS_PUBLIC_HEADERS}
+      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/codecs"
+    )
+  endif()
 endif()
 
 CHECKAPI(
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
index 42aea554e3..3e1620b366 100644
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -56,8 +56,12 @@ libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(GLIB_LIBS) \
 
 libwscodecs_la_DEPENDENCIES = $(top_builddir)/wsutil/libwsutil.la
 
+subpkgincludedir = $(pkgincludedir)/codecs
+
+subpkginclude_HEADERS = \
+	codecs.h
+
 noinst_HEADERS = \
-	codecs.h \
 	G711a/G711adecode.h \
 	G711a/G711atable.h \
 	G711u/G711udecode.h \
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 8325aec179..308d379d43 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -14,8 +14,7 @@ used for troubleshooting, analysis, development and education.
 == What's New
 
 * The installation step for Wireshark will now install headers required to
-  build plugins. A pkg-config file is provided to help with this. Only libwireshark
-  plugins supported for now, other types will be added in the future. Note you
+  build plugins. A pkg-config file is provided to help with this. Note you
   must still rebuild all plugins between minor releases (X.Y).
 
 //=== Bug Fixes
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 5ff2f1ef39..be562b5a78 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -21,6 +21,15 @@
 
 include(UseABICheck)
 
+set(WIRETAP_PUBLIC_HEADERS
+	file_wrappers.h
+	merge.h
+	pcap-encap.h
+	pcapng_module.h
+	wtap.h
+	wtap_opttypes.h
+)
+
 set(WIRETAP_FILES
 	5views.c
 	aethra.c
@@ -151,6 +160,12 @@ if(NOT ${ENABLE_STATIC})
 		RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	)
+
+	if(NOT WIN32)
+		install(FILES ${WIRETAP_PUBLIC_HEADERS}
+			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/wiretap"
+		)
+	endif()
 endif()
 
 CHECKAPI(
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 5e20f351e5..cad0353e0a 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -112,7 +112,6 @@ NONGENERATED_HEADER_FILES = \
 	dct3trace.h		\
 	erf.h			\
 	eyesdn.h		\
-	file_wrappers.h		\
 	hcidump.h		\
 	i4btrace.h		\
 	i4b_trace.h		\
@@ -126,7 +125,6 @@ NONGENERATED_HEADER_FILES = \
 	libpcap.h		\
 	logcat.h		\
 	logcat_text.h		\
-	merge.h			\
 	mpeg.h			\
 	mplog.h			\
 	mp2t.h			\
@@ -140,9 +138,7 @@ NONGENERATED_HEADER_FILES = \
 	ngsniffer.h		\
 	packetlogger.h		\
 	pcap-common.h		\
-	pcap-encap.h		\
 	pcapng.h		\
-	pcapng_module.h		\
 	peekclassic.h           \
 	peektagged.h		\
 	pppdump.h		\
@@ -154,10 +150,16 @@ NONGENERATED_HEADER_FILES = \
 	visual.h		\
 	vms.h			\
 	vwr.h			\
-	wtap.h			\
-	wtap_opttypes.h		\
 	wtap-int.h
 
+PUBLIC_HEADER_FILES = \
+	file_wrappers.h		\
+	merge.h			\
+	pcap-encap.h		\
+	pcapng_module.h		\
+	wtap.h			\
+	wtap_opttypes.h
+
 # Files that generate compileable files
 GENERATOR_FILES = \
        ascend.y			\
@@ -200,6 +202,10 @@ libwiretap_generated_la_SOURCES = \
 
 libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
+subpkgincludedir = $(pkgincludedir)/wiretap
+
+subpkginclude_HEADERS = $(PUBLIC_HEADER_FILES)
+
 CLEANFILES = \
 	libwiretap.a		\
 	libwiretap.la		\