configure.ac | 1 +
src/GL/Makefile.am | 2 +-
src/GLX/Makefile.am | 16 +++++++---------
src/GLX/libglxmapping.c | 4 ++--
src/GLdispatch/Makefile.am | 12 ++++++------
src/GLdispatch/mapi/vnd-glapi/Makefile.am | 2 +-
src/Makefile.am | 2 +-
src/OpenGL/Makefile.am | 2 +-
src/util/Makefile.am | 1 +
src/util/glvnd_pthread/Makefile.am | 2 +-
tests/GLX_dummy/Makefile.am | 9 ++++-----
tests/Makefile.am | 18 +++++++++---------
12 files changed, 35 insertions(+), 36 deletions(-)
New commits:
commit 322c347a7da282b7f114f84d5b722cb9163c3637
Author: Aaron Plattner <aplatt...@nvidia.com>
Date: Thu Sep 26 18:03:01 2013 -0700
[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 <aplatt...@nvidia.com>
Signed-off-by: Brian Nguyen <brngu...@nvidia.com>
diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am
index 805e3f1..6a19df1 100644
--- a/src/OpenGL/Makefile.am
+++ b/src/OpenGL/Makefile.am
@@ -41,7 +41,7 @@ glapitemp.h : $(GLAPI)/gen/gl_and_es_API.xml
$(glapi_gen_mapi_deps)
$(call glapi_gen_mapi,$<,noop-gl)
libOpenGL_la_CFLAGS = \
- -I$(top_builddir)/include
+ -I$(top_srcdir)/include
libOpenGL_la_LDFLAGS = -shared -Wl,--auxiliary=libGLdispatch.so.0
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
commit a569e374413e11f1d56d224df68c89a5710ceff0
Author: Brian Nguyen <brngu...@nvidia.com>
Date: Thu Sep 26 17:27:09 2013 -0700
Fix use of HASH_FIND() in RemoveScreenPointerMapping()
Replace HASH_FIND() with the convenience macro HASH_FIND_PTR() in
RemoveScreenPointerMapping() and ScreenFromPointer(), to be consistent
with AddScreenPointerMapping(). This has the side-effect of fixing
invalid usage of the original HASH_FIND() macro in
RemoveScreenPointerMapping().
Signed-Off-By: Brian Nguyen <brngu...@nvidia.com>
diff --git a/src/GLX/libglxmapping.c b/src/GLX/libglxmapping.c
index c243cf4..ccf5162 100644
--- a/src/GLX/libglxmapping.c
+++ b/src/GLX/libglxmapping.c
@@ -563,7 +563,7 @@ static void RemoveScreenPointerMapping(void *ptr, int
screen)
LKDHASH_WRLOCK(__glXPthreadFuncs, __glXScreenPointerMappingHash);
- HASH_FIND(hh, _LH(__glXScreenPointerMappingHash), ptr, sizeof(ptr),
pEntry);
+ HASH_FIND_PTR(_LH(__glXScreenPointerMappingHash), &ptr, pEntry);
if (pEntry != NULL) {
HASH_DELETE(hh, _LH(__glXScreenPointerMappingHash), pEntry);
@@ -581,7 +581,7 @@ static int ScreenFromPointer(void *ptr)
LKDHASH_RDLOCK(__glXPthreadFuncs, __glXScreenPointerMappingHash);
- HASH_FIND(hh, _LH(__glXScreenPointerMappingHash), &ptr, sizeof(ptr),
pEntry);
+ HASH_FIND_PTR(_LH(__glXScreenPointerMappingHash), &ptr, pEntry);
if (pEntry != NULL) {
screen = pEntry->screen;
commit debae590e724ee064939982bd3f54a613d5fa650
Author: Aaron Plattner <aplatt...@nvidia.com>
Date: Thu Sep 26 14:57:06 2013 -0700
[build] fix srcdir != builddir mistakes
When configure is run from a directory other than the source directory,
various
files fail to compile because the include paths use $(builddir) or
$(top_builddir) when the source is actually in $(srcdir) or $(top_srcdir).
Signed-off-by: Aaron Plattner <aplatt...@nvidia.com>
diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am
index 96f7408..79f34c9 100644
--- a/src/GL/Makefile.am
+++ b/src/GL/Makefile.am
@@ -41,7 +41,7 @@ glapitemp.h : $(GLAPI)/gen/gl_and_es_API.xml
$(glapi_gen_mapi_deps)
$(call glapi_gen_mapi,$<,noop-gl)
libGL_la_CFLAGS = \
- -I$(top_builddir)/include
+ -I$(top_srcdir)/include
libGL_la_LDFLAGS = -shared -Wl,--auxiliary=libGLdispatch.so.0
-Wl,--auxiliary=libGLX.so.0
diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am
index 5f82b6f..729333f 100644
--- a/src/GLX/Makefile.am
+++ b/src/GLX/Makefile.am
@@ -36,13 +36,13 @@ X11GLVND_DIR = ../x11glvnd
# Warning settings
# Include paths
-libGLX_la_CFLAGS = -I$(UTHASH_DIR)
-libGLX_la_CFLAGS += -I$(UTIL_DIR)
-libGLX_la_CFLAGS += -I$(TRACE_DIR)
-libGLX_la_CFLAGS += -I$(GLVND_PTHREAD_DIR)
-libGLX_la_CFLAGS += -I$(GL_DISPATCH_DIR)
-libGLX_la_CFLAGS += -I$(top_builddir)/include
-libGLX_la_CFLAGS += -I$(X11GLVND_DIR)
+libGLX_la_CFLAGS = -I$(srcdir)/$(UTHASH_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(UTIL_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(TRACE_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(GLVND_PTHREAD_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(GL_DISPATCH_DIR)
+libGLX_la_CFLAGS += -I$(top_srcdir)/include
+libGLX_la_CFLAGS += -I$(srcdir)/$(X11GLVND_DIR)
# Required library flags
libGLX_la_CFLAGS += $(PTHREAD_CFLAGS)
diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am
index d012286..2df9484 100644
--- a/src/GLdispatch/Makefile.am
+++ b/src/GLdispatch/Makefile.am
@@ -29,11 +29,11 @@ lib_LTLIBRARIES = libGLdispatch.la
SUBDIRS = mapi/vnd-glapi
-libGLdispatch_la_CFLAGS = -Imapi/glapi
-libGLdispatch_la_CFLAGS += -I../util/trace
-libGLdispatch_la_CFLAGS += -I../util/glvnd_pthread
-libGLdispatch_la_CFLAGS += -Imapi
-libGLdispatch_la_CFLAGS += -I$(top_builddir)/include
+libGLdispatch_la_CFLAGS = -I$(srcdir)/mapi/glapi
+libGLdispatch_la_CFLAGS += -I$(top_srcdir)/src/util/trace
+libGLdispatch_la_CFLAGS += -I$(top_srcdir)/src/util/glvnd_pthread
+libGLdispatch_la_CFLAGS += -I$(srcdir)/mapi
+libGLdispatch_la_CFLAGS += -I$(top_srcdir)/include
libGLdispatch_la_LDFLAGS = -shared
diff --git a/src/GLdispatch/mapi/vnd-glapi/Makefile.am
b/src/GLdispatch/mapi/vnd-glapi/Makefile.am
index d407634..7f4d7e6 100644
--- a/src/GLdispatch/mapi/vnd-glapi/Makefile.am
+++ b/src/GLdispatch/mapi/vnd-glapi/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/$(MAPI_PREFIX) \
-I$(top_builddir)/$(MAPI_PREFIX) \
- -I$(top_builddir)/$(MAPI_PREFIX)/glapi \
+ -I$(top_srcdir)/$(MAPI_PREFIX)/glapi \
-I$(top_srcdir)/$(MAPI_MESA_PREFIX) \
-DMAPI_MODE_GLAPI \
-DMAPI_ABI_HEADER=\"vnd-glapi/glapi_mapi_tmp.h\"
diff --git a/src/util/glvnd_pthread/Makefile.am
b/src/util/glvnd_pthread/Makefile.am
index b36ad88..2c88ef4 100644
--- a/src/util/glvnd_pthread/Makefile.am
+++ b/src/util/glvnd_pthread/Makefile.am
@@ -30,6 +30,6 @@
noinst_LTLIBRARIES = libglvnd_pthread.la
libglvnd_pthread_la_LIBADD = -ldl
-libglvnd_pthread_la_CFLAGS = -I../trace/
+libglvnd_pthread_la_CFLAGS = -I$(top_srcdir)/src/util/trace/
libglvnd_pthread_la_SOURCES = \
glvnd_pthread.c
diff --git a/tests/GLX_dummy/Makefile.am b/tests/GLX_dummy/Makefile.am
index b745dab..7c93899 100644
--- a/tests/GLX_dummy/Makefile.am
+++ b/tests/GLX_dummy/Makefile.am
@@ -9,13 +9,12 @@ libGLX_dummy_copy : libGLX_dummy.la
cp .libs/libGLX_dummy.so.0.0.0 .libs/libGLX_dummy_0.so.0
cp .libs/libGLX_dummy.so.0.0.0 .libs/libGLX_dummy_1.so.0
-GLX_ABI_DIR = $(top_builddir)/src/GLX
libGLX_dummy_la_CFLAGS = \
- -I$(GLX_ABI_DIR) \
- -I$(top_builddir)/src/util \
- -I$(top_builddir)/src/util/trace \
- -I$(top_builddir)/include \
+ -I$(top_srcdir)/src/GLX \
+ -I$(top_srcdir)/src/util \
+ -I$(top_srcdir)/src/util/trace \
+ -I$(top_srcdir)/include \
-Wno-error=unused-function
libGLX_dummy_la_SOURCES = GLX_dummy.c
libGLX_dummy_la_LIBADD = $(top_builddir)/src/util/trace/libtrace.la
commit 4ecfeb2a99e0b0a8824467d82227668d27852f99
Author: Aaron Plattner <aplatt...@nvidia.com>
Date: Thu Sep 26 15:48:30 2013 -0700
[build] reorder SUBDIRS to only recurse once
Currently, both GLX and GLdispatch recurse into src/util/trace. This causes
problems for parallel make, and breaks distclean because the first recursion
into src/util/trace deletes the Makefile, causing the second recursion to
fail.
Instead, recurse directly into util from src/Makefile.am, putting it ahead
of
both GLX and GLdispatch in SUBDIRS. This means that you can't just go into
src/GLX and type make, but it fixes parallel builds and distclean.
Signed-off-by: Aaron Plattner <aplatt...@nvidia.com>
diff --git a/configure.ac b/configure.ac
index 1e026eb..8da796f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,7 @@ AC_CONFIG_FILES([Makefile
src/GLdispatch/mapi/glapi/Makefile
src/GLdispatch/mapi/glapi/gen/Makefile
src/GLdispatch/mapi/vnd-glapi/Makefile
+ src/util/Makefile
src/util/glvnd_pthread/Makefile
src/util/trace/Makefile
tests/Makefile
diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am
index d3ee339..5f82b6f 100644
--- a/src/GLX/Makefile.am
+++ b/src/GLX/Makefile.am
@@ -34,8 +34,6 @@ UTHASH_DIR = ../util/uthash/src
GL_DISPATCH_DIR = ../GLdispatch
X11GLVND_DIR = ../x11glvnd
-SUBDIRS = $(GL_DISPATCH_DIR) $(X11GLVND_DIR) $(TRACE_DIR) $(GLVND_PTHREAD_DIR)
-
# Warning settings
# Include paths
libGLX_la_CFLAGS = -I$(UTHASH_DIR)
diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am
index db8d2c1..d012286 100644
--- a/src/GLdispatch/Makefile.am
+++ b/src/GLdispatch/Makefile.am
@@ -27,7 +27,7 @@
lib_LTLIBRARIES = libGLdispatch.la
-SUBDIRS = mapi/vnd-glapi ../util/trace
+SUBDIRS = mapi/vnd-glapi
libGLdispatch_la_CFLAGS = -Imapi/glapi
libGLdispatch_la_CFLAGS += -I../util/trace
diff --git a/src/Makefile.am b/src/Makefile.am
index f1c013b..50fc737 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = GLX OpenGL GL
+SUBDIRS = util GLdispatch x11glvnd GLX OpenGL GL
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
new file mode 100644
index 0000000..cfdc4a7
--- /dev/null
+++ b/src/util/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = glvnd_pthread trace
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vprxr-00078c...@vasks.debian.org
