Revert "i965/fs: Change fs_visitor::emit_lrp to use MAC for gen<6"

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

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index ae296b92236908697c2506b36dd62fdcd82d2f62..cdd898efc878afb359de88268f994215d9af381b 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -21,12 +21,10 @@
 
 if HAVE_SHARED_GLAPI
 SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
-SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
-SUBDIRS=. tests
-
-GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
+SUBDIRS =
 
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
@@ -35,6 +33,7 @@ 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 \
@@ -83,38 +82,62 @@ libglx_la_SOURCES = \
          single2.c \
          singlepix.c \
          vertarr.c \
-         xfont.c \
          glx_pbuffer.c \
          glx_query.c \
-         drisw_glx.c \
-         dri_common.c \
+         glxhash.c
+
+libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+
+if HAVE_DRISW
+libglx_la_SOURCES += \
+         drisw_glx.c
+endif
+
+if HAVE_DRICOMMON
+libglx_la_SOURCES += \
+         xfont.c \
+         dri_common.c
+endif
+
+if HAVE_DRI2
+libglx_la_SOURCES += \
          dri_glx.c \
          XF86dri.c \
-         glxhash.c \
          dri2_glx.c \
          dri2.c \
-         dri2_query_renderer.c \
-          dri3_glx.c \
-          dri3_common.c \
+         dri2_query_renderer.c
+endif
+
+if HAVE_DRI3
+libglx_la_SOURCES += \
+          dri3_glx.c
+endif
+
+if HAVE_APPLEDRI
+libglx_la_SOURCES += \
          applegl_glx.c
 
+SUBDIRS += apple
+libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
+endif
+
 GL_LIBS = \
        libglx.la \
-       $(SHARED_GLAPI_LIBS) \
-       $(GLAPI_LIB) \
+       $(top_builddir)/src/mapi/glapi/libglapi.la \
+       $(SHARED_GLAPI_LIB) \
        $(GL_LIB_DEPS)
 
 GL_LDFLAGS = \
-       -Wl,-Bsymbolic \
-       -version-number 1:2 -no-undefined
+       -no-undefined \
+       -version-number 1:2 \
+       $(BSYMBOLIC) \
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
 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
+SUBDIRS += . tests
+
+include $(top_srcdir)/install-lib-links.mk