i965/gen7,8: Set SURFACE_IS_ARRAY for all non-3D texture types

[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 d63425d6c6c19027b0417f97b30e1d99138e7dcf..1c6dd08a85d680d9ebb69913604e6540d7af1e48 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -6,6 +6,13 @@ MEGADRIVERS_DEPS =
 
 SUBDIRS+=common
 
+# On Android, we need to explicitly link to libglapi.so.
+if HAVE_ANDROID
+if HAVE_SHARED_GLAPI
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+endif
+endif
+
 if HAVE_I915_DRI
 SUBDIRS += i915
 MEGADRIVERS_DEPS += i915/libi915_dri.la
@@ -60,6 +67,8 @@ mesa_dri_drivers_la_LIBADD = \
         ../../libmesa.la \
         common/libmegadriver_stub.la \
         common/libdricommon.la \
+        common/libxmlconfig.la \
+        $(SHARED_GLAPI_LIB) \
         $(MEGADRIVERS_DEPS) \
         $(DRI_LIB_DEPS) \
         $()
@@ -77,6 +86,12 @@ all-local: mesa_dri_drivers.la
                ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so \
                      $(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
@@ -86,6 +101,11 @@ install-data-hook:
                ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
                      $(DESTDIR)$(dridir)/$$i; \
        done;
-       $(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.*
+       $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*
+
+uninstall-hook:
+       for i in $(MEGADRIVERS); do \
+               $(RM) $(DESTDIR)$(dridir)/$$i; \
+       done;
 
 endif