From d48d7c3a87cbe7c6a7aa38f743e63ad3bafede55 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Thu, 2 Jul 2015 12:50:29 +0200 Subject: [PATCH] cmake: include CMake files in the release tarballs Despite we announced the CMake support in libssh2-1.6.0 release notes, the files required by the CMake build system were not included in the release tarballs. Hence, the only way to use CMake for build was the upstream git repository. This commit makes CMake actually supported in the release tarballs. --- Makefile.am | 3 ++- docs/Makefile.am | 2 +- example/Makefile.am | 2 +- src/Makefile.am | 3 ++- tests/Makefile.am | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 17f5f2a..b6cb52c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,8 @@ win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP) \ win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk \ - maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath + maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \ + CMakeLists.txt cmake ACLOCAL_AMFLAGS = -I m4 diff --git a/docs/Makefile.am b/docs/Makefile.am index dc11f2f..6436a75 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ # $Id: Makefile.am,v 1.37 2009/03/26 15:41:15 bagder Exp $ EXTRA_DIST = template.3 BINDINGS INSTALL_AUTOTOOLS INSTALL_CMAKE HACKING TODO \ - AUTHORS + AUTHORS CMakeLists.txt dist_man_MANS = \ libssh2_agent_connect.3 \ diff --git a/example/Makefile.am b/example/Makefile.am index 8c6636f..5cf5f07 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc -EXTRA_DIST = libssh2_config.h.in +EXTRA_DIST = libssh2_config.h.in libssh2_config_cmake.h.in CMakeLists.txt # samples noinst_PROGRAMS = direct_tcpip ssh2 scp scp_nonblock scp_write \ diff --git a/src/Makefile.am b/src/Makefile.am index 5979a27..fe944b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,8 @@ include ../Makefile.inc libssh2_la_SOURCES = $(CSOURCES) $(HHEADERS) -EXTRA_DIST = libssh2_config.h.in NMakefile +EXTRA_DIST = libssh2_config.h.in libssh2_config_cmake.h.in libssh2.pc.in +EXTRA_DIST += CMakeLists.txt NMakefile lib_LTLIBRARIES = libssh2.la diff --git a/tests/Makefile.am b/tests/Makefile.am index 765de6e..67854cc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,3 +18,4 @@ TESTS_ENVIRONMENT += srcdir=$(top_srcdir)/tests builddir=$(top_builddir)/tests EXTRA_DIST = ssh2.sh mansyntax.sh EXTRA_DIST += etc/host etc/host.pub etc/user etc/user.pub +EXTRA_DIST += CMakeLists.txt libssh2_config_cmake.h.in sshd_fixture.sh.in