diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-23 21:47:02 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-24 10:23:53 +0000 |
| commit | dcf52a16954719906abcaf94d8a7391ba2cfeb43 (patch) | |
| tree | 91bcd6d16925ef9bf984dc47bc7e35b7084508ac /wiretap | |
| parent | b44b7dee03a344822fbc38092b5e9dd6d84939bb (diff) | |
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>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 18 |
2 files changed, 27 insertions, 6 deletions
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 \ |