diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-09 08:58:15 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-09 17:49:37 +0000 |
| commit | 4f658999e68791d083213eabf0de4202e5e4ab46 (patch) | |
| tree | 7776f3794c1c55415f0d4bac2b77585aac9f34d6 /Makefile.am | |
| parent | ffb6f10f4eb0ad126a8496981cfaac0fb324bbc8 (diff) | |
CMake: Migrate to hhc.cmake.
Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
hhc.cmd wrapper.
Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
Reviewed-on: https://code.wireshark.org/review/6449
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 8bce5850b0..54d1b4b038 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1215,24 +1215,21 @@ EXTRA_DIST = \ wiretap/CMakeLists.txt \ README.cmake \ ConfigureChecks.cmake \ - cmake/TestFileOffsetBits.c \ - cmake/TestLargeFiles.c.cmakein \ - cmake/TestWindowsFSeek.c \ - cmake/modules/CMakeInstallDirs.cmake \ - cmake/modules/COPYING-CMAKE-SCRIPTS \ cmake/modules/CheckCCompilerFlag.cmake \ cmake/modules/CheckCLinkerFlag.cmake \ + cmake/modules/CMakeInstallDirs.cmake \ + cmake/modules/COPYING-CMAKE-SCRIPTS \ cmake/modules/FindADNS.cmake \ cmake/modules/FindAIRPCAP.cmake \ cmake/modules/FindASCIIDOC.cmake \ cmake/modules/FindCAP.cmake \ cmake/modules/FindCARES.cmake \ - cmake/modules/FindFOP.cmake \ - cmake/modules/FindGCRYPT.cmake \ - cmake/modules/FindGEOIP.cmake \ cmake/modules/FindChocolatey.cmake \ cmake/modules/FindDOXYGEN.cmake \ + cmake/modules/FindFOP.cmake \ cmake/modules/FindFreetype.cmake \ + cmake/modules/FindGCRYPT.cmake \ + cmake/modules/FindGEOIP.cmake \ cmake/modules/FindGLIB2.cmake \ cmake/modules/FindGMODULE2.cmake \ cmake/modules/FindGNUTLS.cmake \ @@ -1241,11 +1238,11 @@ EXTRA_DIST = \ cmake/modules/FindGTK3.cmake \ cmake/modules/FindHtmlViewer.cmake \ cmake/modules/FindKERBEROS.cmake \ - cmake/modules/FindNL.cmake \ cmake/modules/FindLEX.cmake \ cmake/modules/FindLUA.cmake \ cmake/modules/FindLYNX.cmake \ cmake/modules/FindM.cmake \ + cmake/modules/FindNL.cmake \ cmake/modules/FindOS_X_FRAMEWORKS.cmake \ cmake/modules/FindPCAP.cmake \ cmake/modules/FindPOD.cmake \ @@ -1262,8 +1259,11 @@ EXTRA_DIST = \ cmake/modules/FindYACC.cmake \ cmake/modules/FindYAPP.cmake \ cmake/modules/FindZLIB.cmake \ + cmake/modules/gmxTestLargeFiles.cmake \ + cmake/modules/hhc.cmake \ cmake/modules/LICENSE.txt \ cmake/modules/LocatePythonModule.cmake \ + cmake/modules/readme.txt \ cmake/modules/UseABICheck.cmake \ cmake/modules/UseAsn2Wrs.cmake \ cmake/modules/UseCheckAPI.cmake \ @@ -1273,8 +1273,9 @@ EXTRA_DIST = \ cmake/modules/UseWinLibs.cmake \ cmake/modules/WiresharkConfig.cmake.in \ cmake/modules/WiresharkConfigVersion.cmake.in \ - cmake/modules/gmxTestLargeFiles.cmake \ - cmake/modules/readme.txt \ + cmake/TestFileOffsetBits.c \ + cmake/TestLargeFiles.c.cmakein \ + cmake/TestWindowsFSeek.c \ ui/win32/Makefile.nmake \ ui/win32/console_win32.c \ ui/win32/console_win32.h \ |