summaryrefslogtreecommitdiff
path: root/src/glx/Makefile
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-12-15 18:45:27 -0800
committerIan Romanick <ian.d.romanick@intel.com>2012-01-02 12:41:45 -0800
commit3ef3ba4d2eee36f64062a21ce030c3f4d8c4cac4 (patch)
treecb7b3bc1f1946f49cf597abd5fae30035223e308 /src/glx/Makefile
parent8a4b36de05a133c1c9527836ca58bf8ebdf229bd (diff)
tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
This adds a new tests directory at the top-level and some extra build infrastructure. The tests use the Google C++ Testing Framework, and they will only be built if configure can detect its availability. The tests are automatically wired-in to run with 'make check'. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/glx/Makefile')
-rw-r--r--src/glx/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile
index 67d03bc689b..f702f952ce7 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -83,8 +83,11 @@ INCLUDES = -I. \
default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+libglx.a: $(OBJECTS)
+ $(MKLIB) -cplusplus -o glx -static $(OBJECTS)
+
# Make libGL
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): libglx.a $(OBJECTS) $(GLAPI_LIB) Makefile
$(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
-major 1 -minor 2 \
-cplusplus $(MKLIB_OPTIONS) \