diff -up ncurses-5.9-20150214/c++/Makefile.in.libs ncurses-5.9-20150214/c++/Makefile.in
--- ncurses-5.9-20150214/c++/Makefile.in.libs	2014-11-15 01:46:17.000000000 +0100
+++ ncurses-5.9-20150214/c++/Makefile.in	2015-02-20 15:55:29.944373449 +0100
@@ -112,7 +112,7 @@ LOCAL_LIBDIR	= @top_builddir@/lib
 
 LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
 
 LIBROOT		= ncurses++
 
@@ -147,8 +147,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAG
 LDFLAGS_DEFAULT	= $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
 
 # flags for library built by this makefile
-LDFLAGS		= $(TEST_ARGS) @LDFLAGS@ \
-	@LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS)
+LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS)
 
 AUTO_SRC	= \
 		etip.h
diff -up ncurses-5.9-20150214/form/Makefile.in.libs ncurses-5.9-20150214/form/Makefile.in
--- ncurses-5.9-20150214/form/Makefile.in.libs	2015-02-20 15:55:29.945373051 +0100
+++ ncurses-5.9-20150214/form/Makefile.in	2015-02-20 15:56:52.384528763 +0100
@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@
diff -up ncurses-5.9-20150214/menu/Makefile.in.libs ncurses-5.9-20150214/menu/Makefile.in
--- ncurses-5.9-20150214/menu/Makefile.in.libs	2015-02-20 15:55:29.945373051 +0100
+++ ncurses-5.9-20150214/menu/Makefile.in	2015-02-20 15:57:11.139056836 +0100
@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@
diff -up ncurses-5.9-20150214/panel/Makefile.in.libs ncurses-5.9-20150214/panel/Makefile.in
--- ncurses-5.9-20150214/panel/Makefile.in.libs	2015-02-20 15:55:29.945373051 +0100
+++ ncurses-5.9-20150214/panel/Makefile.in	2015-02-20 15:57:37.425584116 +0100
@@ -109,7 +109,7 @@ LINK		= $(LIBTOOL_LINK)
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@