automake: consistently use -no-undefined

Set the flag for all but the dri targets. They have missing
glapi symbols which are required for the normal operation with
the X server.

Jon, I fear that you'll need to carry the "no-undefined" hunk
locally when building the dri drivers under cygwin.

Cc: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
index c8d01967f08725adb67e4ae77295070489e95c9b..b8d1634fe56fbdcf663632145395b170656f9af6 100644 (file)
--- a/src/egl/wayland/wayland-egl/Makefile.am
+++ b/src/egl/wayland/wayland-egl/Makefile.am
@@ -8,7 +8,9 @@ AM_CFLAGS = $(DEFINES) \
 lib_LTLIBRARIES = libwayland-egl.la
 noinst_HEADERS = wayland-egl-priv.h
 libwayland_egl_la_SOURCES = wayland-egl.c
-libwayland_egl_la_LDFLAGS = -version-info 1
+libwayland_egl_la_LDFLAGS = \
+       -no-undefined \
+       -version-info 1
 
 TESTS = wayland-egl-symbols-check
 

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index a8981fb11d5d8b4d46a92c0b5337e04793a42259..f36d93da403fecc3a5a6db23fec399d4b75631ef 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -54,25 +54,24 @@ GALLIUM_VIDEO_CFLAGS = \
 DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link
 
 GALLIUM_DRI_LINKER_FLAGS = \
+       -shared \
        -module \
        -avoid-version \
-       -Wl,--version-script=$(DRI_VERSION_SCRIPT) \
-       -shared \
-       -no-undefined
+       -Wl,--version-script=$(DRI_VERSION_SCRIPT)
 
 GALLIUM_VDPAU_LINKER_FLAGS = \
+       -shared \
        -module \
+       -no-undefined \
        -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-       -export-symbols-regex $(VDPAU_EXPORTS) \
-       -shared \
-       -no-undefined
+       -export-symbols-regex $(VDPAU_EXPORTS)
 
 GALLIUM_XVMC_LINKER_FLAGS = \
+       -shared \
        -module \
+       -no-undefined \
        -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
-       -shared \
-       -export-symbols-regex '^XvMC' \
-       -no-undefined
+       -export-symbols-regex '^XvMC'
 
 GALLIUM_OMX_LINKER_FLAGS = \
        -shared \

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index b492496a7438058f04d198a3754d41560d8b426a..55eb3baaa06574a35d4c70b499c3d91442fe2361 100644 (file)
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -46,6 +46,7 @@ AM_CPPFLAGS = \
 
 AM_LDFLAGS = \
        -module \
+       -no-undefined \
        -avoid-version \
        -Wl,--no-undefined \
        -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link

diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 6abd2a746d6c9d17f5fb9afa9ab1a46618b3d6b8..d19716309bef0c652b7b861cab06e88f95c2aa6a 100644 (file)
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -19,7 +19,9 @@ include_HEADERS = main/gbm.h
 libgbm_la_SOURCES = \
        main/gbm.c \
        main/backend.c
-libgbm_la_LDFLAGS = -version-info 1:0
+libgbm_la_LDFLAGS = \
+       -no-undefined \
+       -version-info 1:0
 libgbm_la_LIBADD = \
        $(top_builddir)/src/loader/libloader.la \
        $(DLOPEN_LIBS)