linux-integrity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: linux-integrity@vger.kernel.org
Subject: [PATCH 2/4] ima-evm-utils: replace INCLUDES with AM_CPPFLAGS
Date: Thu, 23 May 2019 15:26:21 +0300	[thread overview]
Message-ID: <20190523122623.25684-2-dbaryshkov@gmail.com> (raw)
In-Reply-To: <20190523122623.25684-1-dbaryshkov@gmail.com>

Replace INCLUDES variable with AM_CPPFLAGS to stop Automake from warning
about deprecated variable usage.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 src/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b81281a31d9b..164e7e4af020 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libimaevm.la
 
 libimaevm_la_SOURCES = libimaevm.c
-libimaevm_la_CPPFLAGS = $(LIBCRYPTO_CFLAGS)
+libimaevm_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS)
 # current[:revision[:age]]
 # result: [current-age].age.revision
 libimaevm_la_LDFLAGS = -version-info 0:0:0
@@ -17,11 +17,11 @@ hash_info.h: Makefile
 bin_PROGRAMS = evmctl
 
 evmctl_SOURCES = evmctl.c
-evmctl_CPPFLAGS = $(LIBCRYPTO_CFLAGS)
+evmctl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS)
 evmctl_LDFLAGS = $(LDFLAGS_READLINE)
 evmctl_LDADD =  $(LIBCRYPTO_LIBS) -lkeyutils libimaevm.la
 
-INCLUDES = -I$(top_srcdir) -include config.h
+AM_CPPFLAGS = -I$(top_srcdir) -include config.h
 
 CLEANFILES = hash_info.h
 DISTCLEANFILES = @DISTCLEANFILES@
-- 
2.20.1


  reply	other threads:[~2019-05-23 12:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-23 12:26 [PATCH 1/4] ima-evm-utils: link to libcrypto instead of OpenSSL Dmitry Eremin-Solenikov
2019-05-23 12:26 ` Dmitry Eremin-Solenikov [this message]
2019-05-23 12:26 ` [PATCH 3/4] ima-evm-utils: include hash-info.gen into distribution Dmitry Eremin-Solenikov
2019-05-23 12:26 ` [PATCH 4/4] ima-evm-utils: update .gitignore files Dmitry Eremin-Solenikov
2019-05-23 15:12 ` [PATCH 1/4] ima-evm-utils: link to libcrypto instead of OpenSSL Mimi Zohar
2019-05-23 15:17   ` Dmitry Eremin-Solenikov
2019-07-11 15:07 ` Vitaly Chikunov
2019-07-12  2:05   ` Vitaly Chikunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190523122623.25684-2-dbaryshkov@gmail.com \
    --to=dbaryshkov@gmail.com \
    --cc=linux-integrity@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).