diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-07-30 11:20:39 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-07-30 18:21:58 +0000 |
| commit | e6a2fabf711489a66752ee0e387440c802afcd80 (patch) | |
| tree | 11b4b85cc9d52857627b9f352b26ec7c66462acf | |
| parent | 304388a44f6fcb468f98f2c7179bb39cb4ecd294 (diff) | |
| download | wireshark-e6a2fabf711489a66752ee0e387440c802afcd80.tar.gz | |
Fix dist.
Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1.
Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137
Reviewed-on: https://code.wireshark.org/review/3268
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | packaging/nsis/Makefile.am | 19 | ||||
| -rw-r--r-- | ui/cli/Makefile.common | 3 |
2 files changed, 13 insertions, 9 deletions
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index 1d4cdf4f1b..946fabae89 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -2,18 +2,19 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - wireshark.nsi \ - uninstall.nsi \ - common.nsh \ - GetWindowsVersion.nsh \ - servicelib.nsh \ - VersionCompare.nsh \ AdditionalTasksPage.ini \ - WinPcapPage.ini \ - Makefile.nmake \ + common.nsh \ Custom.nmake \ custom_diameter_xmls.txt \ - custom_plugins.txt \ custom_mibs.txt \ + custom_plugins.txt \ custom_radius_dict.txt \ + GetWindowsVersion.nsh \ + Makefile.nmake \ + servicelib.nsh \ + uninstall.nsi \ + VersionCompare.nsh \ + windeployqt-to-nsis.ps1 \ + WinPcapPage.ini \ + wireshark.nsi \ x64.nsh diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common index fca2671bca..cce232161a 100644 --- a/ui/cli/Makefile.common +++ b/ui/cli/Makefile.common @@ -80,3 +80,6 @@ TSHARK_TAP_SRC = \ tap-stats_tree.c \ tap-sv.c \ tap-wspstat.c + +noinst_HEADERS = \ + tshark-tap.h |