---
src/glx/Makefile.am | 15 ++++-----------
src/glx/tests/Makefile.am | 2 +-
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index b855be9..1914467 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -19,7 +19,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-SUBDIRS=. tests
+SUBDIRS= . tests
AM_CFLAGS = \
-I$(top_srcdir)/include \
@@ -46,9 +46,7 @@ endif
lib_LTLIBRARIES = lib@GL_LIB@.la
-noinst_LTLIBRARIES = libglx.la
-
-libglx_la_SOURCES = \
+lib@GL_LIB@_la_SOURCES = \
clientattrib.c \
clientinfo.c \
compsize.c \
@@ -88,14 +86,9 @@ libglx_la_SOURCES = \
dri2.c \
applegl_glx.c
-GL_LIBS = \
- libglx.la \
+lib@GL_LIB@_la_LIBADD = \
$(top_builddir)/src/mapi/glapi/libglapi.la \
$(GLAPI_LIB) \
$(GL_LIB_DEPS)
-GL_LDFLAGS = -Wl,--no-undefined -Wl,-Bsymbolic -shared -version-number 1:2
-
-lib@GL_LIB@_la_SOURCES =
-lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
-lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
+lib@GL_LIB@_la_LDFLAGS = -Wl,--no-undefined -Wl,-Bsymbolic -shared
-version-number 1:2
diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
index 494b50a..11f6b25 100644
--- a/src/glx/tests/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -18,7 +18,7 @@ glx_test_SOURCES = \
indirect_api.cpp
glx_test_LDADD = \
- $(top_builddir)/src/glx/libglx.la \
+ $(top_builddir)/src/glx/lib@GL_LIB@.la \
$(top_builddir)/src/gtest/libgtest.la \
$(GLAPI_LIB) \
$(PTHREAD_LIBS)
--
1.8.1.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
