projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 74fb2d6171fcaefc1117c8a0a695e8d558aa013d..c6a4c215905e6659441b9ff252cdfc39989461bb 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -3,14 +3,14 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/gallium/state_trackers/dri \
        $(GALLIUM_TARGET_CFLAGS)
 
 AM_CPPFLAGS = \
        $(DEFINES) \
-       -DDRI_TARGET \
-       -DGALLIUM_GALAHAD \
+        -DGALLIUM_DDEBUG \
        -DGALLIUM_NOOP \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
@@ -25,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 += \
@@ -43,39 +45,33 @@ gallium_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
        $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
        $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
-       $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
+       $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
+        $(top_builddir)/src/gallium/drivers/ddebug/libddebug.la \
        $(top_builddir)/src/gallium/drivers/noop/libnoop.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+       $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
+       $(LIBDRM_LIBS) \
        $(SELINUX_LIBS) \
        $(EXPAT_LIBS) \
-       $(LIBDRM_LIBS) \
        $(GALLIUM_COMMON_LIB_DEPS)
 
-# XXX: Temporary allow duplicated symbols, as the loader pulls in xmlconfig.c
-# which already provides driParse* and driQuery* amongst others.
-# Remove this hack as we come up with a cleaner solution.
-gallium_dri_la_LDFLAGS += \
-       -Wl,--allow-multiple-definition
-
 EXTRA_gallium_dri_la_DEPENDENCIES = \
        dri.sym \
        $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
 EXTRA_DIST = \
        SConscript \
+       meson.build \
        dri.sym \
        $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
 
 TARGET_DRIVERS =
 TARGET_CPPFLAGS =
-TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
+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
@@ -86,28 +82,39 @@ 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
 
 if HAVE_GALLIUM_STATIC_TARGETS
 
 gallium_dri_la_SOURCES += target.c
 gallium_dri_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
-gallium_dri_la_LIBADD += $(TARGET_LIB_DEPS) \
+gallium_dri_la_LIBADD += \
+       $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
+       $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+       $(TARGET_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS
 
 gallium_dri_la_LIBADD += \
-       $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
-       $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-       $(GALLIUM_PIPE_LOADER_LIBS)
+       $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
 
 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
@@ -121,6 +128,12 @@ all-local: $(dri_LTLIBRARIES)
                ln -f .libs/gallium_dri.so                              \
                        $${link_dir}/$${i}_dri.so;                      \
        done
+
+clean-local:
+       $(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;         \
+       $(AM_V_GEN)for i in $(TARGET_DRIVERS); do                       \
+               $(RM) $${link_dir}/$${i}_dri.so;                        \
+       done;
 endif
 
 # hardlink each megadriver instance, but don't actually have
@@ -130,9 +143,10 @@ install-data-hook:
                ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
                      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
        done;                                                           \
-       $(RM) -f $(DESTDIR)$(dridir)/gallium_dri.*
+       $(RM) $(DESTDIR)$(dridir)/gallium_dri.*;                        \
+       $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
 
 uninstall-hook:
        for i in $(TARGET_DRIVERS); do                                  \
-               $(RM) -f $(DESTDIR)$(dridir)/$${i}_dri.so;              \
+               $(RM) $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
        done;