[Mesa-dev] [PATCH 19/24] automake: consistently use -no-undefined

[Emil Velikov]

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 at dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/egl/wayland/wayland-egl/Makefile.am    |  4 +++-
 src/gallium/Automake.inc                   | 17 ++++++++---------
 src/gallium/targets/egl-static/Makefile.am |  1 +
 src/gbm/Makefile.am                        |  4 +++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
index c8d0196..b8d1634 100644
--- 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 a8981fb..f36d93d 100644
--- 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 b492496..55eb3ba 100644
--- 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 6abd2a7..d197163 100644
--- 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)
-- 
1.9.1