i965/gen6/gs: Handle the case where a geometry shader emits no output.

[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 57b2341fa07b36a5eaf06ae8cec31ef721703f01..2009da921ba5ab1de32d64df0713ec7bc8c2651f 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -37,7 +37,9 @@ MEGADRIVERS += radeon_dri.so
 endif
 
 if HAVE_SWRAST_DRI
-SUBDIRS+=swrast
+SUBDIRS += swrast
+MEGADRIVERS_DEPS += swrast/libswrast_dri.la
+MEGADRIVERS += swrast_dri.so
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -49,29 +51,32 @@ 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 \
         $(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 \
                ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so \
                      $(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.
@@ -80,7 +85,6 @@ 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) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.*
 
 endif