From c3bb38c4cbb0429a0f9a3f27ef73c837d2f2c68f Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 14 Oct 2014 17:44:15 +0100 Subject: [PATCH] targets: bundle all files in the tarball We were missing a few files - The version scripts - Android & scons build scripts - A few headers. Signed-off-by: Emil Velikov --- src/gallium/targets/dri/Makefile.am | 5 +++++ src/gallium/targets/egl-static/Makefile.am | 7 ++++++- src/gallium/targets/gbm/Makefile.am | 3 +++ src/gallium/targets/libgl-xlib/Makefile.am | 3 +++ src/gallium/targets/omx/Makefile.am | 2 ++ src/gallium/targets/opencl/Makefile.am | 2 ++ src/gallium/targets/osmesa/Makefile.am | 2 ++ src/gallium/targets/pipe-loader/Makefile.am | 2 ++ src/gallium/targets/va/Makefile.am | 2 ++ src/gallium/targets/vdpau/Makefile.am | 4 ++++ src/gallium/targets/xa/Makefile.am | 2 ++ src/gallium/targets/xvmc/Makefile.am | 1 + 12 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 1094ffd4960..13c29ad93f1 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -59,6 +59,11 @@ gallium_dri_la_LIBADD = \ 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 + TARGET_DRIVERS = TARGET_CPPFLAGS = TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 3f0e650e270..d5759e6ca30 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -59,7 +59,9 @@ nodist_EXTRA_egl_gallium_la_SOURCES = dummy.cpp egl_gallium_la_SOURCES = \ egl.c \ egl_pipe.c \ - egl_st.c + egl_pipe.h \ + egl_st.c \ + egl_st.h egl_gallium_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la \ @@ -151,6 +153,9 @@ egl_gallium_la_LIBADD += \ $(top_builddir)/src/mapi/vgapi/libOpenVG.la endif +EXTRA_egl_gallium_la_DEPENDENCIES = egl.sym +EXTRA_DIST = Android.mk SConscript + #if HAVE_GALLIUM_STATIC_TARGETS TARGET_DRIVERS = diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 2c9b425845a..77f1adb3067 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -50,6 +50,9 @@ gbm_gallium_drm_la_LDFLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/gbm/gbm.sym endif +EXTRA_gbm_gallium_drm_la_DEPENDENCIES = gbm.sym +EXTRA_DIST = gallium-gbm-symbols-check + if HAVE_GALLIUM_STATIC_TARGETS TARGET_DRIVERS = diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index 4ed2025a765..cb77a54db49 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -74,4 +74,7 @@ AM_CPPFLAGS += -DGALLIUM_LLVMPIPE lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) endif +EXTRA_lib@GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym +EXTRA_DIST = SConscript + include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 4be1063953e..7ea3144ffd3 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -30,6 +30,8 @@ libomx_mesa_la_LIBADD = \ $(OMX_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym + if HAVE_GALLIUM_STATIC_TARGETS TARGET_DRIVERS = diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 1c5a908b20f..11cc0c1433c 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -43,6 +43,8 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \ 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 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 3a554a947eb..058b09814d4 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -75,6 +75,8 @@ lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) endif +EXTRA_lib@OSMESA_LIB@_la_DEPENDENCIES = osmesa.sym + include $(top_srcdir)/install-gallium-links.mk pkgconfigdir = $(libdir)/pkgconfig diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index f1220176605..5022550cf67 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -193,3 +193,5 @@ pipe_swrast_la_LIBADD += \ $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la endif endif + +EXTRA_DIST = pipe.sym diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am index 8112f781c9c..53b43c642ed 100644 --- a/src/gallium/targets/va/Makefile.am +++ b/src/gallium/targets/va/Makefile.am @@ -30,6 +30,8 @@ gallium_drv_video_la_LIBADD = \ $(VA_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym + if HAVE_GALLIUM_STATIC_TARGETS TARGET_DRIVERS = diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index ac80dfb8182..68f72a09363 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -36,6 +36,10 @@ libvdpau_gallium_la_LIBADD = \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +EXTRA_libvdpau_gallium_la_DEPENDENCIES = \ + vdpau.sym \ + $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn + TARGET_DRIVERS = TARGET_CPPFLAGS = TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 77d9fa68c20..3ab788692c1 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -51,6 +51,8 @@ libxatracker_la_LDFLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xa/xa.sym endif +EXTRA_libxatracker_la_DEPENDENCIES = xa.sym + if HAVE_GALLIUM_STATIC_TARGETS TARGET_DRIVERS = diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 9bef87a4e03..7c8799c413e 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -31,6 +31,7 @@ libXvMCgallium_la_LIBADD = \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +EXTRA_libXvMCgallium_la_DEPENDENCIES = xvmc.sym TARGET_DRIVERS = TARGET_CPPFLAGS = -- 2.30.2