gallium: work around libtool relink issue for libdrm

[mesa.git] / src / gallium / targets / dri / Makefile.am

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 06ade45fe1b0572181776103c5fae500c3fc2b63..c6a4c215905e6659441b9ff252cdfc39989461bb 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -1,11 +1,5 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
-if HAVE_ANDROID
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-endif
-
 AM_CFLAGS = \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
@@ -31,8 +25,10 @@ gallium_dri_la_LDFLAGS = \
        -shared \
        -shrext .so \
        -module \
+       -no-undefined \
        -avoid-version \
-       $(GC_SECTIONS)
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
 if HAVE_LD_VERSION_SCRIPT
 gallium_dri_la_LDFLAGS += \
@@ -55,10 +51,10 @@ gallium_dri_la_LIBADD = \
        $(top_builddir)/src/gallium/drivers/noop/libnoop.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-       $(SHARED_GLAPI_LIB) \
+       $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
+       $(LIBDRM_LIBS) \
        $(SELINUX_LIBS) \
        $(EXPAT_LIBS) \
-       $(LIBDRM_LIBS) \
        $(GALLIUM_COMMON_LIB_DEPS)
 
 EXTRA_gallium_dri_la_DEPENDENCIES = \
@@ -66,6 +62,7 @@ EXTRA_gallium_dri_la_DEPENDENCIES = \
        $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
 EXTRA_DIST = \
        SConscript \
+       meson.build \
        dri.sym \
        $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
 
@@ -75,8 +72,6 @@ TARGET_LIB_DEPS =
 
 include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
 
-include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc
-
 include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc
@@ -87,10 +82,17 @@ include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
 
+include $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc
+
 include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/vc5/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc
 
+include $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/imx/Automake.inc
+
 include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
 include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
 include $(top_srcdir)/src/gallium/drivers/swr/Automake.inc
@@ -112,7 +114,7 @@ gallium_dri_la_LIBADD += \
 
 endif # HAVE_GALLIUM_STATIC_TARGETS
 
-if HAVE_MESA_LLVM
+if HAVE_GALLIUM_LLVM
 gallium_dri_la_LIBADD += $(LLVM_LIBS)
 gallium_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 endif
@@ -141,7 +143,8 @@ install-data-hook:
                ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
                      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
        done;                                                           \
-       $(RM) $(DESTDIR)$(dridir)/gallium_dri.*
+       $(RM) $(DESTDIR)$(dridir)/gallium_dri.*;                        \
+       $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
 
 uninstall-hook:
        for i in $(TARGET_DRIVERS); do                                  \