diff --git a/Makefile.am b/Makefile.am
index 21beffa..b7e1120 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
 AM_CFLAGS=$(WARN_CFLAGS)
-LDADD = lib/libiscsi.la
 
 EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
 	     packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 036a06d..4807178 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
 AM_CFLAGS=$(WARN_CFLAGS)
-LDADD = ../lib/libiscsi.la
+AM_LDFLAGS=-no-undefined
+LIBS=../lib/libiscsi.la
 
 noinst_PROGRAMS = iscsiclient iscsi-dd
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4a8a916..e6f82c8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,9 +17,11 @@ libiscsipriv_la_SOURCES += iser.c
 endif
 
 if HAVE_LINUX_ISER
-libiscsipriv_la_LDFLAGS = -libverbs -lrdmacm -lpthread
+libiscsipriv_la_LIBADD = -libverbs -lrdmacm -lpthread
 endif
 
+libiscsipriv_la_LDFLAGS = -no-undefined
+
 libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \
 	"-D_U_=__attribute__((unused))" \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index 848db03..f40787a 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -2,7 +2,8 @@ AM_CPPFLAGS=-I. -I${srcdir}/../include \
 	"-D_U_=__attribute__((unused)) " \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
 AM_CFLAGS=$(WARN_CFLAGS)
-LDADD = ../lib/libiscsipriv.la
+AM_LDFLAGS=-no-undefined
+LIBS = ../lib/libiscsipriv.la
 
 EXTRA_DIST = README
 
@@ -13,7 +14,7 @@ dist_noinst_HEADERS = iscsi-support.h \
 # libiscsi test tool using cunit
 if ISCSITEST
 bin_PROGRAMS = iscsi-test-cu
-iscsi_test_cu_LDFLAGS = -ldl -lcunit
+iscsi_test_cu_LDADD = -ldl -lcunit
 iscsi_test_cu_SOURCES = iscsi-test-cu.c \
 	iscsi-support.c \
 	iscsi-multipath.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a43c7d0..06bf504 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
 AM_CFLAGS = $(WARN_CFLAGS)
-LDADD = ../lib/libiscsi.la
+AM_LDFLAGS = -no-undefined
+LIBS = ../lib/libiscsi.la
 
 noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \
 	prog_readwrite_iov prog_timeout prog_read_all_pdus \
diff --git a/utils/Makefile.am b/utils/Makefile.am
index bde1c81..7aab327 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
 AM_CFLAGS = $(WARN_CFLAGS)
-LDADD = ../lib/libiscsi.la
+AM_LDFLAGS = -no-undefined
+LIBS = ../lib/libiscsi.la
 
 bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \
 	iscsi-swp