--- ../libssh2-1.6.0/example/Makefile 2016-02-24 13:22:34 +1100 +++ example/Makefile 2016-02-24 12:41:26 +1100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # example/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -91,8 +101,6 @@ $(am__EXEEXT_1) #am__append_1 = x11 subdir = example -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/libssh2_config.h.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -102,6 +110,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/libssh2_config.h libssh2_config.h CONFIG_CLEAN_FILES = @@ -275,16 +284,18 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libssh2_config.h.in \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = aclocal-1.14 +ACLOCAL = aclocal-1.15 ALLOCA = AMTAR = $${TAR-tar} -AM_DEFAULT_VERBOSITY = 1 +AM_DEFAULT_VERBOSITY = 0 AR = ar AS = as AUTOCONF = autoconf AUTOHEADER = autoheader -AUTOMAKE = automake-1.14 +AUTOMAKE = automake-1.15 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -325,7 +336,7 @@ LIBOBJS = LIBS = -lws2_32 -lgdi32 LIBSREQUIRED = libssl,libcrypto,zlib -LIBSSH2VER = 1.6.0 +LIBSSH2VER = 1.7.0 LIBSSL = C:/_32/msys_492/1.0/local/lib/libssl.a C:/_32/msys_492/1.0/local/lib/libcrypto.a LIBSSL_PREFIX = C:/_32/msys_492/1.0/local LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -364,10 +375,10 @@ SSHD = STRIP = strip VERSION = - -abs_builddir = /c/_32/comp/libssh2-1.6.0/example -abs_srcdir = /c/_32/comp/libssh2-1.6.0/example -abs_top_builddir = /c/_32/comp/libssh2-1.6.0 -abs_top_srcdir = /c/_32/comp/libssh2-1.6.0 +abs_builddir = /c/_32/comp/libssh2-1.7.0/example +abs_srcdir = /c/_32/comp/libssh2-1.7.0/example +abs_top_builddir = /c/_32/comp/libssh2-1.7.0 +abs_top_srcdir = /c/_32/comp/libssh2-1.7.0 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -396,7 +407,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /c/_32/comp/libssh2-1.6.0/install-sh +install_sh = ${SHELL} /c/_32/comp/libssh2-1.7.0/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -408,6 +419,7 @@ prefix = C:/_32/msys_492/1.0/local program_transform_name = s,x,x, psdir = ${docdir} +runstatedir = ${localstatedir}/run sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . @@ -417,7 +429,7 @@ top_builddir = .. top_srcdir = .. AUTOMAKE_OPTIONS = foreign nostdinc -EXTRA_DIST = libssh2_config.h.in +EXTRA_DIST = libssh2_config.h.in libssh2_config_cmake.h.in CMakeLists.txt AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/example LDADD = $(top_builddir)/src/libssh2.la all: libssh2_config.h @@ -437,7 +449,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign example/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign example/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -828,6 +839,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.