| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From 5bb10f3da420f4c46e44423276a9da0d4bc1b691 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 3 | Date: Wed, 6 Mar 2019 01:17:12 +0300 |
| 4 | Subject: [PATCH 2/4] ima-evm-utils: replace INCLUDES with AM_CPPFLAGS |
| 5 | |
| 6 | Replace INCLUDES variable with AM_CPPFLAGS to stop Automake from warning |
| 7 | about deprecated variable usage. |
| 8 | |
| 9 | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 10 | --- |
| 11 | src/Makefile.am | 6 +++--- |
| 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 15 | index b81281a..164e7e4 100644 |
| 16 | --- a/src/Makefile.am |
| 17 | +++ b/src/Makefile.am |
| 18 | @@ -1,7 +1,7 @@ |
| 19 | lib_LTLIBRARIES = libimaevm.la |
| 20 | |
| 21 | libimaevm_la_SOURCES = libimaevm.c |
| 22 | -libimaevm_la_CPPFLAGS = $(LIBCRYPTO_CFLAGS) |
| 23 | +libimaevm_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS) |
| 24 | # current[:revision[:age]] |
| 25 | # result: [current-age].age.revision |
| 26 | libimaevm_la_LDFLAGS = -version-info 0:0:0 |
| 27 | @@ -17,11 +17,11 @@ hash_info.h: Makefile |
| 28 | bin_PROGRAMS = evmctl |
| 29 | |
| 30 | evmctl_SOURCES = evmctl.c |
| 31 | -evmctl_CPPFLAGS = $(LIBCRYPTO_CFLAGS) |
| 32 | +evmctl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS) |
| 33 | evmctl_LDFLAGS = $(LDFLAGS_READLINE) |
| 34 | evmctl_LDADD = $(LIBCRYPTO_LIBS) -lkeyutils libimaevm.la |
| 35 | |
| 36 | -INCLUDES = -I$(top_srcdir) -include config.h |
| 37 | +AM_CPPFLAGS = -I$(top_srcdir) -include config.h |
| 38 | |
| 39 | CLEANFILES = hash_info.h |
| 40 | DISTCLEANFILES = @DISTCLEANFILES@ |
| 41 | -- |
| 42 | 2.17.1 |
| 43 | |