[Mesa-dev] [PATCH v2 01/12] make: change include to work for meson

[Dylan Baker]

Meson expects you to include the generated target in another target's
sources, and it will generate the include directives for you, so change
the source file and add the generated glx builddir to the autotools
include to make that work.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 src/glx/tests/Makefile.am    | 1 +
 src/glx/tests/enum_sizes.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
index a41759b863e..94a0b75c443 100644
--- a/src/glx/tests/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_srcdir)/src/glx \
+	-I$(top_builddir)/src/glx \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/GL/internal \
 	$(DEFINES) \
diff --git a/src/glx/tests/enum_sizes.cpp b/src/glx/tests/enum_sizes.cpp
index 20fc75879c0..6119dcbc43a 100644
--- a/src/glx/tests/enum_sizes.cpp
+++ b/src/glx/tests/enum_sizes.cpp
@@ -36,7 +36,7 @@
 #include <gtest/gtest.h>
 #include <GL/gl.h>
 extern "C" {
-#include "../indirect_size.h"
+#include "indirect_size.h"
 }
 
 TEST(ValidEnumSizes, CallLists)
-- 
2.14.1