1*4882a593SmuzhiyunFrom fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Julien Viard de Galbert <julien@vdg.name> 3*4882a593SmuzhiyunDate: Wed, 8 Feb 2017 21:26:58 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Do not use includedir as include search path for build 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun--includedir is not used to specify where a program should 7*4882a593Smuzhiyunlook for headers of libraries, but to tell where it should 8*4882a593Smuzhiyuninstall its own headers. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Julien Viard de Galbert <julien@vdg.name> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun configure.ac | 6 +++--- 13*4882a593Smuzhiyun dieharder/Makefile.am | 2 +- 14*4882a593Smuzhiyun libdieharder/Makefile.am | 2 +- 15*4882a593Smuzhiyun 3 files changed, 5 insertions(+), 5 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 18*4882a593Smuzhiyunindex b336115..91f7c64 100644 19*4882a593Smuzhiyun--- a/configure.ac 20*4882a593Smuzhiyun+++ b/configure.ac 21*4882a593Smuzhiyun@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T 22*4882a593Smuzhiyun AC_C_VOLATILE 23*4882a593Smuzhiyun AC_C_INLINE 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun-DIEHARDER_CFLAGS="-I$includedir" 26*4882a593Smuzhiyun-dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir" 27*4882a593Smuzhiyun-libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir" 28*4882a593Smuzhiyun+DIEHARDER_CFLAGS="" 29*4882a593Smuzhiyun+dieharder_CFLAGS="-std=c99 -Wall -pedantic" 30*4882a593Smuzhiyun+libdieharder_lo_CFLAGS="-Wall -pedantic" 31*4882a593Smuzhiyun DIEHARDER_LIBS="-L$libdir -ldieharder" 32*4882a593Smuzhiyun ACLOCAL_AMFLAGS="-I m4" 33*4882a593Smuzhiyun 34*4882a593Smuzhiyundiff --git a/dieharder/Makefile.am b/dieharder/Makefile.am 35*4882a593Smuzhiyunindex e6fbff2..7bdac5c 100644 36*4882a593Smuzhiyun--- a/dieharder/Makefile.am 37*4882a593Smuzhiyun+++ b/dieharder/Makefile.am 38*4882a593Smuzhiyun@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION) 39*4882a593Smuzhiyun # CC = gcc 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun # Compile flags (use fairly standard -O3 as default) 42*4882a593Smuzhiyun-AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir} 43*4882a593Smuzhiyun+AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) 44*4882a593Smuzhiyun AM_CFLAGS = -O3 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun # Load flags (optional) 47*4882a593Smuzhiyundiff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am 48*4882a593Smuzhiyunindex 5fd3396..0873f9c 100644 49*4882a593Smuzhiyun--- a/libdieharder/Makefile.am 50*4882a593Smuzhiyun+++ b/libdieharder/Makefile.am 51*4882a593Smuzhiyun@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN) 52*4882a593Smuzhiyun # CC = gcc 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun # Compile flags (use fairly standard -O3 as default) 55*4882a593Smuzhiyun-AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir} 56*4882a593Smuzhiyun+AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include 57*4882a593Smuzhiyun AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun #======================================================================== 60*4882a593Smuzhiyun-- 61*4882a593Smuzhiyun2.1.4 62*4882a593Smuzhiyun 63