From 76591d5e727b35295ea238322f73515c8cc93945 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 4 Aug 2014 09:46:00 +0800 Subject: discover/grub2: distinguish parser.h from grub2/parser.h 'make distcheck' will do a 'make all' srcdir == objdir, then later a 'make check' sith srcdir != objdir. Since gcc's cpp always assumes that a source file's directory is first in the include paths, we may see discover/parser.h included when we wanted the generated discover/grub2/parser.h. This change renames the grub2 lexer and parser files, to work-around this behaviour, and fix 'make distcheck'. Signed-off-by: Jeremy Kerr --- test/parser/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'test') diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index 7541149..95ee002 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -106,6 +106,7 @@ test_parser_libtest_ro_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir)/discover \ -I$(top_srcdir)/discover/grub2 \ + -I$(top_builddir)/discover/grub2 \ -DPETITBOOT_TEST \ -DLOCAL_STATE_DIR='"$(localstatedir)"' \ -DTEST_CONF_BASE='"$(top_srcdir)/test/parser/data"' -- cgit v1.2.1