From 3d357d030faddb11990d37cc8e9327b34de5ea76 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 6 Dec 2014 23:22:20 -0800 Subject: [PATCH] gallium/targets: Add *.sym files to distribution. And add d3dadapter9's extra dependency. --- src/gallium/targets/d3dadapter9/Makefile.am | 2 ++ src/gallium/targets/dri/Makefile.am | 5 ++++- src/gallium/targets/gbm/Makefile.am | 2 +- src/gallium/targets/libgl-xlib/Makefile.am | 2 +- src/gallium/targets/omx/Makefile.am | 1 + src/gallium/targets/opencl/Makefile.am | 2 +- src/gallium/targets/osmesa/Makefile.am | 1 + src/gallium/targets/va/Makefile.am | 1 + src/gallium/targets/vdpau/Makefile.am | 3 +++ src/gallium/targets/xa/Makefile.am | 1 + src/gallium/targets/xvmc/Makefile.am | 1 + 11 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index 1f3f3cb8212..1dc55f5c1cd 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -80,6 +80,8 @@ d3dadapter9_la_LIBADD = \ $(EXPAT_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +EXTRA_d3dadapter9_la_DEPENDENCIES = d3dadapter9.sym +EXTRA_DIST = d3dadapter9.sym TARGET_DRIVERS = TARGET_CPPFLAGS = diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 3c7140d75b5..c2eea275e60 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -63,7 +63,10 @@ gallium_dri_la_LDFLAGS += \ EXTRA_gallium_dri_la_DEPENDENCIES = \ dri.sym \ $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn -EXTRA_DIST = SConscript +EXTRA_DIST = \ + SConscript \ + dri.sym \ + $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn TARGET_DRIVERS = TARGET_CPPFLAGS = diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 412bc2b9573..aaf75807644 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -52,7 +52,7 @@ gbm_gallium_drm_la_LDFLAGS += \ endif EXTRA_gbm_gallium_drm_la_DEPENDENCIES = gbm.sym -EXTRA_DIST = gallium-gbm-symbols-check +EXTRA_DIST = gallium-gbm-symbols-check gbm.sym if HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index cb77a54db49..03ba946682a 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -75,6 +75,6 @@ lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) endif EXTRA_lib@GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym -EXTRA_DIST = SConscript +EXTRA_DIST = SConscript libgl-xlib.sym include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 1e2d239efbe..0ae7c55198c 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -33,6 +33,7 @@ libomx_mesa_la_LIBADD = \ $(GALLIUM_COMMON_LIB_DEPS) EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym +EXTRA_DIST = omx.sym if HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 11cc0c1433c..5daf327fb47 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -44,7 +44,7 @@ nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp lib@OPENCL_LIBNAME@_la_SOURCES = EXTRA_lib@OPENCL_LIBNAME@_la_DEPENDENCIES = opencl.sym -EXTRA_DIST = mesa.icd +EXTRA_DIST = mesa.icd opencl.sym if HAVE_CLOVER_ICD icddir = /etc/OpenCL/vendors/ diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index 058b09814d4..f53823aecae 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -76,6 +76,7 @@ lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllv endif EXTRA_lib@OSMESA_LIB@_la_DEPENDENCIES = osmesa.sym +EXTRA_DIST = osmesa.sym include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am index 1ade4591b76..11297e0df78 100644 --- a/src/gallium/targets/va/Makefile.am +++ b/src/gallium/targets/va/Makefile.am @@ -33,6 +33,7 @@ gallium_drv_video_la_LIBADD = \ $(GALLIUM_COMMON_LIB_DEPS) EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym +EXTRA_DIST = va.sym if HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 1c1a690ccbc..f9a8d236f39 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -40,6 +40,9 @@ libvdpau_gallium_la_LIBADD = \ EXTRA_libvdpau_gallium_la_DEPENDENCIES = \ vdpau.sym \ $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn +EXTRA_DIST = \ + vdpau.sym \ + $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn TARGET_DRIVERS = TARGET_CPPFLAGS = diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index ab5b28e1425..a1eae2af13f 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -53,6 +53,7 @@ libxatracker_la_LDFLAGS += \ endif EXTRA_libxatracker_la_DEPENDENCIES = xa.sym +EXTRA_DIST = xa.sym if HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 573abd3b7eb..cb39722cc84 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -33,6 +33,7 @@ libXvMCgallium_la_LIBADD = \ $(GALLIUM_COMMON_LIB_DEPS) EXTRA_libXvMCgallium_la_DEPENDENCIES = xvmc.sym +EXTRA_DIST = xvmc.sym TARGET_DRIVERS = TARGET_CPPFLAGS = -- 2.30.2