diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-06 15:59:24 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-09-07 00:02:29 +0000 |
| commit | facc9535044bf082bf958be47babba4f35b9fa2e (patch) | |
| tree | 3545d8d6fa2ec2ea9e9ad59cb6f17617bc946c5c | |
| parent | 9fb9e9f5a9d4130a67c22d0807af0d4027ef2322 (diff) | |
| download | wireshark-facc9535044bf082bf958be47babba4f35b9fa2e.tar.gz | |
Autotools: Distribute packaging/wix.
…otherwise you can't compile from the tarball on Windows.
Change-Id: I99c73b09d9468f0da753c05451fa54348680963f
Reviewed-on: https://code.wireshark.org/review/17543
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | packaging/Makefile.am | 3 | ||||
| -rw-r--r-- | packaging/wix/Makefile.am | 22 |
3 files changed, 24 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4527988511..aa041d54f5 100644 --- a/configure.ac +++ b/configure.ac @@ -2816,6 +2816,7 @@ AC_CONFIG_FILES( packaging/svr4/Makefile packaging/svr4/checkinstall packaging/svr4/pkginfo + packaging/wix/Makefile plugins/Makefile plugins/docsis/Makefile plugins/easy_codec/Makefile diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 1535072307..7a888a7e85 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -1,11 +1,10 @@ # -SUBDIRS = macosx rpm svr4 nsis +SUBDIRS = macosx rpm svr4 nsis wix MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - macosx/Info.plist.in \ portableapps/appinfo.tmpl \ portableapps/CMakeLists.txt \ portableapps/help.html \ diff --git a/packaging/wix/Makefile.am b/packaging/wix/Makefile.am new file mode 100644 index 0000000000..deda36c965 --- /dev/null +++ b/packaging/wix/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = \ + Makefile.in + +EXTRA_DIST = \ + CMakeLists.txt \ + COPYING.rtf \ + ComponentGroups.wxi \ + DirectoryStructure.wxi \ + Features.wxi \ + InputPaths.wxi \ + Plugins.wxi \ + Prerequisites.wxi \ + README \ + UserInterface.wxi \ + Wireshark.wxs \ + WiresharkOptionsDlg.wxs \ + WiresharkWixUI.wxs \ + banner.bmp \ + banner.svg \ + dialog.bmp \ + dialog.svg \ + windeployqt-to-wix.ps1 |