Place -L/-l flags into *_LIBADD/*_LDADD

	* src/Makefile.am: -L and -l ought to be in LIBADD/LDADD because
	that is the only place guaranteed to be in the right spot.  So add
	Them to libabigail_la_LIBADD.
	* tools/Makefile.am: Likewise.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>

diff --git a/src/Makefile.am b/src/Makefile.am
index aa5a093190a2b357c16406fbe1872e4d36540b8f..9c08400a774fab778355faca9d434c941b7c01c4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,8 @@ abg-viz-common.cc                     \
 abg-viz-dot.cc                         \
 abg-viz-svg.cc
 
-libabigail_la_LDFLAGS=$(DEPS_LIBS) -Wl,--as-needed
+libabigail_la_LIBADD = $(DEPS_LIBS)
+libabigail_la_LDFLAGS = -Wl,--as-needed -no-undefined
 
 AM_CPPFLAGS=$(DEPS_CPPFLAGS) -Wall -I$(abs_top_srcdir)/include -I$(abs_top_builddir)/include -I$(abs_top_builddir)
 AM_CXXFLAGS="-std=gnu++11"

diff --git a/tools/Makefile.am b/tools/Makefile.am
index f8bcf19009afcacf1476eac30f32dbbd1a43bc6a..8f3003e29fc147dff5a9effcd99c12a96d842bb0 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,27 +15,23 @@ endif
 if ENABLE_ZIP_ARCHIVE
 biar_SOURCES = biar.cc
 biardir = $(bindir)
-biar_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
-biar_DEPENDENCIES = libtoolsutils.la
+biar_LDADD = ../src/libabigail.la libtoolsutils.la
 endif
 
 bidiff_SOURCES = bidiff.cc
 bidiffdir = $(bindir)
-bidiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
-bidiff_DEPENDENCIES = libtoolsutils.la
+bidiff_LDADD = ../src/libabigail.la libtoolsutils.la
 
 bilint_SOURCES = bilint.cc
 bilintdir = $(bindir)
-bilint_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
-bilint_DEPENDENCIES = libtoolsutils.la
+bilint_LDADD = ../src/libabigail.la libtoolsutils.la
 
 bidw_SOURCES = bidw.cc
 bidwdir = $(bindir)
-bidw_LDFLAGS = $(abs_top_builddir)/src/libabigail.la $(abs_top_builddir)/tools/libtoolsutils.la
-bidw_DEPENDENCIES = libtoolsutils.la
+bidw_LDADD = ../src/libabigail.la libtoolsutils.la
 
 bisym_SOURCES = bisym.cc
 bisymdir = $(bindir)
-bisym_LDFLAGS = $(abs_top_builddir)/src/libabigail.la
+bisym_LDADD = ../src/libabigail.la
 
 AM_CPPFLAGS=-I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/tools