cryb.to
/
cryb-to
mirror of https://github.com/cryb-to/cryb-to.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix include paths for some tests. 

It was wrong to remove $(AM_CPPFLAGS) in d43a6bf2, because it is only used for code for which there is no explicit *_CPPFLAGS.  It is not entirely clear why this did not trip us (or Travis) up until now, although it is possible that it only breaks when $(builddir) != $(srcdir).

On the other hand, there is no reason to use $(INCLUDES).
This commit is contained in:
Dag-Erling Smørgrav 2017-04-29 18:28:54 +02:00
parent 9926ca1118
commit 48269ce937
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/Makefile.am
View File

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CPPFLAGS =
EXTRA_DIST =
noinst_HEADERS =
@ -19,14 +19,14 @@ libt = $(top_builddir)/lib/test/libcryb-test.la
# Additional headers, flags and libraries for OpenSSL
if OPENSSL_TESTS
OPENSSL_INCLUDES = $(INCLUDES)
OPENSSL_INCLUDES =
OPENSSL_CFLAGS = -DWITH_OPENSSL=1
OPENSSL_LDADD = -lcrypto
endif OPENSSL_TESTS
# Additional headers, flags and libraries for RSAREF
if RSAREF_TESTS
RSAREF_INCLUDES = $(INCLUDES) -I$(top_srcdir)/lib/rsaref
RSAREF_INCLUDES = -I$(top_srcdir)/lib/rsaref
RSAREF_CFLAGS = -DWITH_RSAREF=1 -DPROTOTYPES=1
RSAREF_LDADD = $(top_builddir)/lib/rsaref/librsaref.la
endif RSAREF_TESTS
@ -37,7 +37,7 @@ TESTS =
# c++ header test
TESTS += t_cxx
t_cxx_SOURCES = t_cxx.cc
t_cxx_CPPFLAGS =
t_cxx_CPPFLAGS = $(AM_CPPFLAGS)
t_cxx_LDADD =
if CRYB_CIPHER
t_cxx_CPPFLAGS += -DWITH_CRYB_CIPHER