From 309f2d2020cf2137845b5e3402b0fc7bc9e96c7b Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Fri, 31 Jan 2014 17:37:20 -0800
Subject: [PATCH] Use LDADD instead of LDFLAGS/DEPENDENCIES.

This is a lot shorter to type, and still gets the dependencies to work
(tested with touch src/dispatch_common.c; make check, and touch
src/egl_common.c; make check).
---
 src/Makefile.am  |  5 ++++-
 test/Makefile.am | 35 +++++++++++++----------------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3bf1243..ceefda2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,7 +115,10 @@ libepoxy_la_SOURCES = \
 libepoxy_la_LDFLAGS = \
 	-no-undefined \
         -Bsymbolic \
-        $(EPOXY_LINK_LIBS) \
+	$()
+
+libepoxy_la_LIBADD = \
+	$(EPOXY_LINK_LIBS) \
 	$()
 
 if BUILD_EGL
diff --git a/test/Makefile.am b/test/Makefile.am
index 612b617..269a00d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -99,41 +99,32 @@ WGL_TESTS = \
 WGL_LIBS = libwgl_common.la
 endif
 
-egl_has_extension_nocontext_LDFLAGS = $(X11_LIBS) $(EPOXY) libegl_common.la
-egl_has_extension_nocontext_DEPENDENCIES = $(EPOXY) libegl_common.la
+egl_has_extension_nocontext_LDADD = $(X11_LIBS) $(EPOXY) libegl_common.la
 
 egl_gles1_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=1
 egl_gles1_without_glx_SOURCES = egl_without_glx.c
-egl_gles1_without_glx_LDFLAGS = $(X11_LIBS) $(EPOXY) $(DLOPEN_LIBS) libegl_common.la
-egl_gles1_without_glx_DEPENDENCIES = $(EPOXY) libegl_common.la
+egl_gles1_without_glx_LDADD = $(X11_LIBS) $(EPOXY) $(DLOPEN_LIBS) libegl_common.la
 
 egl_gles2_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=2
 egl_gles2_without_glx_SOURCES = egl_without_glx.c
-egl_gles2_without_glx_LDFLAGS = $(X11_LIBS) $(EPOXY) $(DLOPEN_LIBS) libegl_common.la
-egl_gles2_without_glx_DEPENDENCIES = $(EPOXY) libegl_common.la
+egl_gles2_without_glx_LDADD = $(X11_LIBS) $(EPOXY) $(DLOPEN_LIBS) libegl_common.la
 
-glx_beginend_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la $(GL_LIBS)
-glx_beginend_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_beginend_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la $(GL_LIBS)
 
-glx_public_api_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
-glx_public_api_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_public_api_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la
 
-glx_public_api_core_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
-glx_public_api_core_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_public_api_core_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la
 
-glx_glxgetprocaddress_nocontext_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
-glx_glxgetprocaddress_nocontext_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_glxgetprocaddress_nocontext_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la
 
-glx_has_extension_nocontext_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
-glx_has_extension_nocontext_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_has_extension_nocontext_LDADD = $(X11_LIBS) $(EPOXY) libglx_common.la
 
 glx_static_CFLAGS = -DNEEDS_TO_BE_STATIC
-glx_static_LDFLAGS = -ldl $(X11_LIBS) -static $(EPOXY) libglx_common.la
-glx_static_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_static_LDADD = -ldl $(X11_LIBS) $(EPOXY) libglx_common.la
+glx_static_LDFLAGS = -static
 
 glx_shared_znow_SOURCES = glx_static.c
-glx_shared_znow_LDFLAGS = -ldl $(X11_LIBS) -z now $(EPOXY) libglx_common.la
-glx_shared_znow_DEPENDENCIES = $(EPOXY) libglx_common.la
+glx_shared_znow_LDADD = -ldl $(X11_LIBS) $(EPOXY) libglx_common.la
+glx_shared_znow_LDFLAGS = -z now
 
-wgl_core_and_exts_LDFLAGS = $(EPOXY) libwgl_common.la -lgdi32
-wgl_core_and_exts_DEPENDENCIES = $(EPOXY) libwgl_common.la
+wgl_core_and_exts_LDADD = $(EPOXY) libwgl_common.la -lgdi32