Turn glxproxy.a into glxproxy.la, and add an explicit dependency on dix.
Signed-off-by: Cyril Brulebois <[email protected]>
---
hw/dmx/Makefile.am | 2 +-
hw/dmx/glxProxy/Makefile.am | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 0d06346..0d051e0 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -9,7 +9,7 @@ endif
if GLX
SUBDIRS += glxProxy
-GLX_LIBS = glxProxy/libglxproxy.a
+GLX_LIBS = glxProxy/libglxproxy.la
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
GLX_DEFS = @GL_CFLAGS@
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index 8516048..dde7980 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libglxproxy.a
+noinst_LTLIBRARIES = libglxproxy.la
-libglxproxy_a_SOURCES = compsize.c \
+libglxproxy_la_SOURCES = compsize.c \
g_disptab.c \
g_disptab.h \
global.c \
@@ -31,6 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \
renderpixswap.c \
unpack.h
+libglxproxy_la_LIBADD = $(DIX_LIB)
+
AM_CFLAGS = \
@GLX_ARCH_DEFINES@ \
$(DIX_CFLAGS) \
--
1.7.2.3
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
