diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2013-09-26 18:03:01 -0700 |
|---|---|---|
| committer | brnguyen <brnguyen@nvidia.com> | 2013-09-26 23:00:34 -0700 |
| commit | 322c347a7da282b7f114f84d5b722cb9163c3637 (patch) | |
| tree | 157a4a34626bded7f5126027e1501a7349eed254 /tests | |
| parent | a569e374413e11f1d56d224df68c89a5710ceff0 (diff) | |
[build] fix more srcdir != builddir mistakes
I missed these in commit debae590e724ee064939982bd3f54a613d5fa650 because my
test system had a compatible glxext.h in /usr/include/GL. On a system with an
incompatible version (i.e. Ubuntu), this causes build failures. Fix the include
paths to include the GL headers from the repository instead of the system.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index f25474d..ba6c9cf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -61,16 +61,16 @@ testglxnscreens_SOURCES = \ testglxnscreens.c \ test_utils.c -X11GLVND_DIR = $(top_builddir)/src/x11glvnd +X11GLVND_DIR = src/x11glvnd -testglxnscreens_CFLAGS = -I$(X11GLVND_DIR) $(AM_CFLAGS) +testglxnscreens_CFLAGS = -I$(top_srcdir)/$(X11GLVND_DIR) $(AM_CFLAGS) testglxnscreens_LDADD = -lX11 testglxnscreens_LDADD += $(top_builddir)/src/GLX/libGLX.la testglxnscreens_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la testglxnscreens_LDADD += $(top_builddir)/src/util/glvnd_pthread/libglvnd_pthread.la testglxnscreens_LDADD += $(top_builddir)/src/util/trace/libtrace.la -testglxnscreens_LDADD += -lX11 $(X11GLVND_DIR)/libx11glvnd_client.la +testglxnscreens_LDADD += -lX11 $(top_builddir)/$(X11GLVND_DIR)/libx11glvnd_client.la # The *_oldlink variant tests that linking against legacy libGL.so works @@ -89,17 +89,17 @@ testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/GL/libGL.la testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/util/glvnd_pthread/libglvnd_pthread.la testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/util/trace/libtrace.la -testx11glvndproto_CFLAGS = -I$(X11GLVND_DIR) -testx11glvndproto_LDADD = -lX11 $(X11GLVND_DIR)/libx11glvnd_client.la +testx11glvndproto_CFLAGS = -I$(top_srcdir)/$(X11GLVND_DIR) +testx11glvndproto_LDADD = -lX11 $(top_builddir)/$(X11GLVND_DIR)/libx11glvnd_client.la # Disable annoying "unused" errors AM_CFLAGS = \ -Wno-error=unused-variable \ -Wno-error=unused-label \ - -I$(top_builddir)/include \ - -I$(top_builddir)/src/util \ - -I$(top_builddir)/src/util/trace \ - -I$(top_builddir)/src/util/glvnd_pthread + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/util \ + -I$(top_srcdir)/src/util/trace \ + -I$(top_srcdir)/src/util/glvnd_pthread testglxgetprocaddress_LDADD = $(top_builddir)/src/GLX/libGLX.la |