i965/fs: Pass key->render_to_fbo via src1 of FS_OPCODE_DDY_*.

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

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 4553de01a1737e99232e1e39efbe4b7de7576f05..451531237f9a326d1d75c4929880118d4d6a1e73 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -24,7 +24,7 @@ SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
 SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
-SUBDIRS=. tests
+SUBDIRS =
 
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
@@ -86,6 +86,8 @@ libglx_la_SOURCES = \
          glx_query.c \
          glxhash.c
 
+libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+
 if HAVE_DRISW
 libglx_la_SOURCES += \
          drisw_glx.c
@@ -94,7 +96,8 @@ endif
 if HAVE_DRICOMMON
 libglx_la_SOURCES += \
          xfont.c \
-         dri_common.c
+         dri_common.c \
+         dri_common_query_renderer.c
 endif
 
 if HAVE_DRI2
@@ -102,8 +105,7 @@ libglx_la_SOURCES += \
          dri_glx.c \
          XF86dri.c \
          dri2_glx.c \
-         dri2.c \
-         dri2_query_renderer.c
+         dri2.c
 endif
 
 if HAVE_DRI3
@@ -114,9 +116,10 @@ endif
 if HAVE_APPLEDRI
 libglx_la_SOURCES += \
          applegl_glx.c
-endif
 
-libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+SUBDIRS += apple
+libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
+endif
 
 GL_LIBS = \
        libglx.la \
@@ -135,4 +138,6 @@ lib@GL_LIB@_la_SOURCES =
 lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
 lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
 
+SUBDIRS += . tests
+
 include $(top_srcdir)/install-lib-links.mk