diff options
| author | Eric Anholt <[email protected]> | 2012-03-05 17:01:13 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-04-12 17:18:00 -0700 |
| commit | 94726d263ebee6364e9be2f254c3ca7d1f85dde4 (patch) | |
| tree | d1f66e287e2475aef8db5a0210cf9bf3d1d9a532 /src | |
| parent | 3d000e7dd14c3185b9e27a6c38a67288b4d10431 (diff) | |
glx: Hook up the unit tests again using the internal gtest.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/.gitignore | 3 | ||||
| -rw-r--r-- | src/glx/Makefile.am | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/glx/.gitignore b/src/glx/.gitignore index f3c7a7c5da6..010d3f20648 100644 --- a/src/glx/.gitignore +++ b/src/glx/.gitignore @@ -1 +1,4 @@ Makefile +Makefile.in +libGL.la +libglx.la diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index ec62faade99..30fbd63751a 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -55,7 +55,9 @@ lib_LTLIBRARIES = \ $(NORMAL_GL_LIB) \ $(MANGLED_GL_LIB) -GL_FILES = \ +noinst_LTLIBRARIES = libglx.la + +libglx_la_SOURCES = \ clientattrib.c \ clientinfo.c \ compsize.c \ @@ -96,6 +98,7 @@ GL_FILES = \ applegl_glx.c GL_LIBS = \ + libglx.la \ $(SHARED_GLAPI_LIBS) \ $(GLAPI_LIB) \ $(GL_LIB_DEPS) @@ -104,8 +107,8 @@ GL_LDFLAGS = \ -Wl,-Bsymbolic \ -version-number 1:2 -no-undefined -libGL_la_SOURCES = $(GL_FILES) -libMangledGL_la_SOURCES = $(GL_FILES) +libGL_la_SOURCES = +libMangledGL_la_SOURCES = libGL_la_LIBADD = $(GL_LIBS) libMangledGL_la_LIBADD = $(GL_LIBS) libGL_la_LDFLAGS = $(GL_LDFLAGS) |