Mesa (master): make: Don't traverse backwards through include directories.
Dylan Baker
dbaker at kemper.freedesktop.org
Mon Oct 9 20:57:56 UTC 2017
Module: Mesa
Branch: master
Commit: 1b1bb6ee103a79de11aa4941ccbcd34f0a158276
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b1bb6ee103a79de11aa4941ccbcd34f0a158276
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Wed Oct 4 15:33:18 2017 -0700
make: Don't traverse backwards through include directories.
Traversing back through includes is bad idea and should be avoided.
In the case here - indirect_size.h is located in the build directory
$(top_builddir)/src/glx/.
v3: - Update commit message with message provided by Emil
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
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 a41759b863..aab93e732a 100644
--- a/src/glx/tests/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
+ -I$(top_builddir)/src/glx \
-I$(top_srcdir)/src/glx \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/GL/internal \
diff --git a/src/glx/tests/enum_sizes.cpp b/src/glx/tests/enum_sizes.cpp
index 20fc75879c..6119dcbc43 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)
More information about the mesa-commit
mailing list