diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/Automake.inc | 7 | ||||
| -rw-r--r-- | src/gallium/targets/r600/vdpau/Makefile.am | 10 | ||||
| -rw-r--r-- | src/gallium/targets/radeonsi/vdpau/Makefile.am | 10 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-nouveau/Makefile.am | 7 |
4 files changed, 16 insertions, 18 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index b242bb4ced7..765fdd2a17d 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -36,3 +36,10 @@ GALLIUM_VIDEO_CFLAGS = \ $(PTHREAD_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(VISIBILITY_CFLAGS) + +GALLIUM_VDPAU_LINKER_FLAGS = \ + -module \ + -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ + -export-symbols-regex $(VDPAU_EXPORTS) \ + -shared \ + -no-undefined diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am index 742df52074f..3a65a6fa771 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -20,6 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc +VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ @@ -28,18 +30,12 @@ AM_CFLAGS = \ vdpaudir = $(VDPAU_LIB_INSTALL_DIR) vdpau_LTLIBRARIES = libvdpau_r600.la -EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' - libvdpau_r600_la_SOURCES = \ drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_r600_la_LDFLAGS = \ - -module \ - -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -export-symbols-regex $(EXPORTS) \ - -shared \ - -no-undefined + $(GALLIUM_VDPAU_LINKER_FLAGS) libvdpau_r600_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am index 9b14634b6d2..cd4dcfc1dd7 100644 --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am @@ -20,6 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc +VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ @@ -28,19 +30,13 @@ AM_CFLAGS = \ vdpaudir = $(VDPAU_LIB_INSTALL_DIR) vdpau_LTLIBRARIES = libvdpau_radeonsi.la -EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' - nodist_EXTRA_libvdpau_radeonsi_la_SOURCES = dummy.cpp libvdpau_radeonsi_la_SOURCES = \ drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_radeonsi_la_LDFLAGS = \ - -module \ - -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -export-symbols-regex $(EXPORTS) \ - -shared \ - -no-undefined + $(GALLIUM_VDPAU_LINKER_FLAGS) libvdpau_radeonsi_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am index 20eb9208e2b..8a15d461f1b 100644 --- a/src/gallium/targets/vdpau-nouveau/Makefile.am +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am @@ -20,6 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc +VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|nouveau_drm_screen_create)$$' include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ @@ -34,10 +36,7 @@ libvdpau_nouveau_la_SOURCES = \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_nouveau_la_LDFLAGS = \ - -module \ - -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -shared \ - -no-undefined + $(GALLIUM_VDPAU_LINKER_FLAGS) libvdpau_nouveau_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ |