diff --git a/c++/Makefile.in b/c++/Makefile.in
index f03468b..8941936 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -120,7 +120,7 @@ SHLIB_LIST	= $(SHLIB_DIRS) \
 		-l@FORM_NAME@@ABI_SUFFIX@ \
 		-l@MENU_NAME@@ABI_SUFFIX@ \
 		-l@PANEL_NAME@@ABI_SUFFIX@ \
-		-lncurses@ABI_SUFFIX@ @SHLIB_LIST@
+		-lncurses@ABI_SUFFIX@ #@SHLIB_LIST@
 
 LIBROOT		= ncurses++
 
@@ -159,8 +159,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
 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 --git a/form/Makefile.in b/form/Makefile.in
index 753e42f..03655d9 100644
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -115,7 +115,7 @@ LINK		= $(LIBTOOL_LINK)
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ #@SHLIB_LIST@
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@
diff --git a/menu/Makefile.in b/menu/Makefile.in
index 5f96e76..14b3b58 100644
--- a/menu/Makefile.in
+++ b/menu/Makefile.in
@@ -115,7 +115,7 @@ LINK		= $(LIBTOOL_LINK)
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ #@SHLIB_LIST@
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@
diff --git a/panel/Makefile.in b/panel/Makefile.in
index 53abc36..8388891 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -117,7 +117,7 @@ LINK		= $(LIBTOOL_LINK)
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ #@SHLIB_LIST@
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@