diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2016-11-30 07:13:09 +0300 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2017-05-19 02:22:02 +0300 |
commit | a5aba630fce7342530140254ddabd5a46c5af572 (patch) | |
tree | 30b7919ee2931499e9128ba43403ff28346f47f2 | |
parent | a526dfbfaca1ef3f35c03f3ddf8a32c802f7f7c9 (diff) | |
download | gnutls-a5aba630fce7342530140254ddabd5a46c5af572.tar.gz |
Don't let GnuTLS headers in NETTLE_CFLAGS override local headers
Change order of CFLAGS so that local headers always come before ones in
$(NETTLE_CFLAGS).
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-rw-r--r-- | tests/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 929bd866a1..3bac80b531 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -274,49 +274,49 @@ endif endif gc_CPPFLAGS = $(CPPFLAGS) \ - $(NETTLE_CFLAGS) \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ -I$(top_srcdir)/lib/minitasn1 \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/gl \ - -I$(top_builddir)/gl + -I$(top_builddir)/gl \ + $(NETTLE_CFLAGS) mpi_CPPFLAGS = $(CPPFLAGS) \ - $(NETTLE_CFLAGS) \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ -I$(top_srcdir)/lib/minitasn1 \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/gl \ - -I$(top_builddir)/gl + -I$(top_builddir)/gl \ + $(NETTLE_CFLAGS) atfork_CPPFLAGS = $(CPPFLAGS) \ - $(NETTLE_CFLAGS) \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ -I$(top_srcdir)/lib/minitasn1 \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/gl \ - -I$(top_builddir)/gl + -I$(top_builddir)/gl \ + $(NETTLE_CFLAGS) pkcs12_s2k_CPPFLAGS = $(CPPFLAGS) \ - $(NETTLE_CFLAGS) \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ -I$(top_srcdir)/lib/minitasn1 \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/gl \ - -I$(top_builddir)/gl + -I$(top_builddir)/gl \ + $(NETTLE_CFLAGS) name_constraints_merge_CPPFLAGS = $(CPPFLAGS) \ - $(NETTLE_CFLAGS) \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ -I$(top_srcdir)/lib/minitasn1 \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/gl \ - -I$(top_builddir)/gl + -I$(top_builddir)/gl \ + $(NETTLE_CFLAGS) check_PROGRAMS = $(ctests) dist_check_SCRIPTS = rfc2253-escape-test rsa-md5-collision/rsa-md5-collision.sh systemkey.sh \ |