Browse Source

targets/vdpau: move linker flags to Automake.inc

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
tags/mesa-10.1-rc1
Emil Velikov 12 years ago
parent
commit
5f0df8ab22

+ 7
- 0
src/gallium/Automake.inc View File

@@ -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

+ 3
- 7
src/gallium/targets/r600/vdpau/Makefile.am View File

@@ -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 \

+ 3
- 7
src/gallium/targets/radeonsi/vdpau/Makefile.am View File

@@ -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 \

+ 3
- 4
src/gallium/targets/vdpau-nouveau/Makefile.am View File

@@ -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 \

Loading…
Cancel
Save