i965/nir/vec4: Handle uniforms on vertex programs

[mesa.git] / src / mesa / drivers / dri / Makefile.am

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index aee6990c4394f62a85a7354d8a684939a95e25ba..08a8e6455219da5b9cf53557d83fc4143aed9331 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -46,28 +46,32 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dri.pc
 
 driincludedir = $(includedir)/GL/internal
-driinclude_HEADERS = $(top_srcdir)/include/GL/internal/dri_interface.h
+driinclude_HEADERS = \
+       $(top_srcdir)/include/GL/internal/dri_interface.h
 
 nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
 mesa_dri_drivers_la_SOURCES =
 mesa_dri_drivers_la_LDFLAGS = \
-        -module -avoid-version -shared \
-        -Wl,-Bsymbolic \
+        -module -avoid-version -shared -shrext .so \
+        $(BSYMBOLIC) \
+        $(GC_SECTIONS) \
         $()
 mesa_dri_drivers_la_LIBADD = \
         ../../libmesa.la \
         common/libmegadriver_stub.la \
         common/libdricommon.la \
+        common/libxmlconfig.la \
         $(MEGADRIVERS_DEPS) \
-        $(MEGADRIVER_DRI_LIB_DEPS) \
+        $(DRI_LIB_DEPS) \
         $()
 
 if NEED_MEGADRIVER
 dri_LTLIBRARIES = mesa_dri_drivers.la
 
+if HAVE_COMPAT_SYMLINKS
 # Add a link to allow setting LD_LIBRARY_PATH/LIBGL_DRIVERS_PATH to /lib of the build tree.
 all-local: mesa_dri_drivers.la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+       $(AM_V_at)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
        $(AM_V_GEN)ln -f .libs/mesa_dri_drivers.so \
                         $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
        $(AM_V_GEN)for i in $(MEGADRIVERS); do \
@@ -75,6 +79,13 @@ all-local: mesa_dri_drivers.la
                      $(top_builddir)/$(LIB_DIR)/$$i; \
        done;
 
+clean-local:
+       $(AM_V_GEN)$(RM) $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
+       $(AM_V_GEN)for i in $(MEGADRIVERS); do \
+               $(RM) $(top_builddir)/$(LIB_DIR)/$$i; \
+       done;
+endif
+
 # hardlink each megadriver instance, but don't actually have
 # mesa_dri_drivers.so in the set of final installed files.
 install-data-hook:
@@ -82,7 +93,11 @@ install-data-hook:
                ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
                      $(DESTDIR)$(dridir)/$$i; \
        done;
-       $(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so
-       $(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.la
+       $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*
+
+uninstall-hook:
+       for i in $(MEGADRIVERS); do \
+               $(RM) $(DESTDIR)$(dridir)/$$i; \
+       done;
 
 endif