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 37a938d14ea6cb475e51cc5fa2cc195d1f19685b..c8dfb8651b68ea6401ff14db8327f13f3ce60cee 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -24,9 +24,9 @@ SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
 SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
-SUBDIRS=tests
+SUBDIRS=. tests
 
-GLAPI_LIB = ../mapi/glapi/libglapi.a
+GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
 
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
@@ -35,8 +35,12 @@ endif
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/GL/internal \
+       -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mapi/glapi \
+       -I$(top_builddir)/src/mapi \
+       -I$(top_builddir)/src/mapi/glapi \
+       $(VISIBILITY_CFLAGS) \
        $(SHARED_GLAPI_CFLAGS) \
        $(EXTRA_DEFINES_XF86VIDMODE) \
        -D_REENTRANT \
@@ -47,15 +51,7 @@ AM_CFLAGS = \
        $(GLPROTO_CFLAGS) \
        $(X11_INCLUDES)
 
-if HAVE_MANGLED_GL
-MANGLED_GL_LIB = libMangledGL.la
-else
-NORMAL_GL_LIB = libGL.la
-endif
-
-lib_LTLIBRARIES = \
-       $(NORMAL_GL_LIB) \
-       $(MANGLED_GL_LIB)
+lib_LTLIBRARIES = lib@GL_LIB@.la
 
 noinst_LTLIBRARIES = libglx.la
 
@@ -82,6 +78,7 @@ libglx_la_SOURCES = \
          indirect_vertex_program.c \
          pixel.c \
          pixelstore.c \
+         query_renderer.c \
          render2.c \
          renderpix.c \
          single2.c \
@@ -97,8 +94,16 @@ libglx_la_SOURCES = \
          glxhash.c \
          dri2_glx.c \
          dri2.c \
+         dri2_query_renderer.c \
          applegl_glx.c
 
+if HAVE_DRI3
+libglx_la_SOURCES += \
+          dri3_glx.c
+endif
+
+libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+
 GL_LIBS = \
        libglx.la \
        $(SHARED_GLAPI_LIBS) \
@@ -109,21 +114,8 @@ GL_LDFLAGS = \
        -Wl,-Bsymbolic \
        -version-number 1:2 -no-undefined
 
-libGL_la_SOURCES =
-libMangledGL_la_SOURCES =
-libGL_la_LIBADD = $(GL_LIBS)
-libMangledGL_la_LIBADD = $(GL_LIBS)
-libGL_la_LDFLAGS = $(GL_LDFLAGS)
-libMangledGL_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.
-if !HAVE_MANGLED_GL
-all-local: $(NORMAL_GL_LIB) $(MANGLED_GL_LIB)
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-       ln -f .libs/libGL.so.1.2.0 $(top_builddir)/$(LIB_DIR)/libGL.so.1
-       ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so
-endif
+lib@GL_LIB@_la_SOURCES =
+lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
+lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
 
-$(GLAPI_LIB):
-       @$(MAKE) -C $(TOP)/src/mapi/glapi
+include $(top_srcdir)/install-lib-links.mk