From 9ac018d0fc7119dc7d016e9952bb7825b247d504 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Sat, 15 Aug 2015 18:10:50 +0200 Subject: [PATCH] Build: Pass nostdinc option to automake It seems automake automatically adds the directory containing the generated version.h to the include path. Use nostdinc to disable default includes altogether. --- Makefile.am | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1f63ae5b..a020af4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I autostuff -local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src +local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. local_includes += -Ibindings/cxx/include -I${srcdir}/bindings/cxx/include -Ibindings/cxx AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' diff --git a/configure.ac b/configure.ac index a5a309b1..9da84775 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) # We require at least automake 1.11 (needed for 'silent rules'). -AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define subdir-objects check-news color-tests]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define nostdinc subdir-objects check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR])