build: fix out-of-tree build

The change in d44ba48 removed -I$(top_builddir)/src/xkbcomp, but this is
needed in order to find the generated parser.h file which is put in the
build dir.

I also added -I$(top_builddir)/src in order to match the meson behavior.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/50

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index a23c59f..999873f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS = \
        -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
        -DXLOCALEDIR='"$(XLOCALEDIR)"' \
        -I$(top_srcdir)/src \
+       -I$(top_builddir)/src/xkbcomp \
        -include $(top_builddir)/src/config.h
 
 AM_CFLAGS = $(BASE_CFLAGS)

diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y
index 7ff6f92..ead2016 100644 (file)
--- a/src/xkbcomp/parser.y
+++ b/src/xkbcomp/parser.y
@@ -31,9 +31,9 @@
  */
 
 %{
-#include "xkbcomp-priv.h"
-#include "ast-build.h"
-#include "parser-priv.h"
+#include "xkbcomp/xkbcomp-priv.h"
+#include "xkbcomp/ast-build.h"
+#include "xkbcomp/parser-priv.h"
 #include "scanner-utils.h"
 
 struct parser_param {