---
configure.ac | 14 +-------------
src/glx/.gitignore | 1 +
src/glx/Makefile.am | 9 ++++++---
tests/glx/Makefile.am | 8 +++++---
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index ce48c81..0cdd17d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,18 +82,6 @@ solaris*)
;;
esac
-AC_PATH_PROG([GTESTCONFIG], [gtest-config])
-if test "x$GTESTCONFIG" != "x"; then
- GTEST_CFLAGS=`gtest-config --cppflags --cxxflags`
- GTEST_LIBS=`gtest-config --ldflags --libs`
- AC_SUBST([GTEST_CFLAGS])
- AC_SUBST([GTEST_LIBS])
- HAVE_GTEST=yes
-else
- HAVE_GTEST=no
-fi
-AM_CONDITIONAL(HAVE_GTEST, test x$HAVE_GTEST = xyes)
-
dnl clang is mostly GCC-compatible, but its version is much lower,
dnl so we have to check for it.
AC_MSG_CHECKING([if compiling with clang])
@@ -793,7 +781,7 @@ dnl
dnl this variable will be prepended to SRC_DIRS and is not exported
CORE_DIRS=""
-SRC_DIRS=""
+SRC_DIRS="gtest"
GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers"
GALLIUM_TARGET_DIRS=""
diff --git a/src/glx/.gitignore b/src/glx/.gitignore
index ea7b611..0706311 100644
--- a/src/glx/.gitignore
+++ b/src/glx/.gitignore
@@ -3,3 +3,4 @@
Makefile
Makefile.in
libGL.la
+libglx.la
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index b5bbebd..f2ac4ef 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)
@@ -103,8 +106,8 @@ GL_LIBS = \
GL_LDFLAGS = \
-version-number 1:2
-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)
diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am
index cdebf5d..b5cc0b0 100644
--- a/tests/glx/Makefile.am
+++ b/tests/glx/Makefile.am
@@ -3,7 +3,6 @@ AM_CFLAGS = -I$(top_builddir)/src/glx
-I$(top_builddir)/src/mapi \
AM_CXXFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
$(X11_CFLAGS) $(GTEST_CFLAGS)
-if HAVE_GTEST
if HAVE_XCB_GLX_CREATE_CONTEXT
TESTS = glx_unittest
check_PROGRAMS = glx_unittest
@@ -13,6 +12,9 @@ glx_unittest_SOURCES = \
create_context_unittest.cpp \
fake_glx_screen.cpp
-glx_unittest_LDADD = $(top_builddir)/src/glx/libglx.a $(GTEST_LIBS)
-lgtest_main
-endif
+glx_unittest_LDADD = \
+ $(top_builddir)/src/glx/libglx.la \
+ $(top_builddir)/src/gtest/libgtest.la \
+ -lpthread
+
endif
--
1.7.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
