From 1f015d72b18e6bf8db3ec447a561ca17cc98a4ac Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Fri, 21 Nov 2008 14:34:03 +0000 Subject: [PATCH] Use AM_CPPFLAGS instead of deprecated INCLUDES. --- example/simple/Makefile.am | 3 +-- src/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/example/simple/Makefile.am b/example/simple/Makefile.am index f098970..4dc6398 100644 --- a/example/simple/Makefile.am +++ b/example/simple/Makefile.am @@ -12,6 +12,5 @@ noinst_PROGRAMS = ssh2 \ # the examples need the $(top_builddir)/src since when building outside of the # source dir they still need to reach the libssh2_config.h header -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src LDADD = $(top_builddir)/src/libssh2.la - diff --git a/src/Makefile.am b/src/Makefile.am index ba0376e..10e8944 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.12 2008/11/20 10:09:43 jas4711 Exp $ +# $Id: Makefile.am,v 1.13 2008/11/21 14:34:03 jas4711 Exp $ AUTOMAKE_OPTIONS = foreign nostdinc libssh2_la_SOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c \ @@ -18,7 +18,7 @@ lib_LTLIBRARIES = libssh2.la # srcdir/include for the shipped headers # builddir/src for the generated config header when building out of the source # tree -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/src +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/src VERSION=-version-info 1:0:0