glsl: Silence "type qualifiers ignored on function return type" warning

[mesa.git] / src / glx / Makefile.am

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 6d81471b63f9b1ab2b3f1a27a1ee97257e3225df..c8dfb8651b68ea6401ff14db8327f13f3ce60cee 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -99,10 +99,11 @@ libglx_la_SOURCES = \
 
 if HAVE_DRI3
 libglx_la_SOURCES += \
-          dri3_glx.c \
-          dri3_common.c
+          dri3_glx.c
 endif
 
+libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+
 GL_LIBS = \
        libglx.la \
        $(SHARED_GLAPI_LIBS) \
@@ -117,9 +118,4 @@ lib@GL_LIB@_la_SOURCES =
 lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
 lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
 
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: lib@GL_LIB@.la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-       ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1
-       ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so
+include $(top_srcdir)/install-lib-links.mk