-rain $(LDFLAGS_CURSES) $(LOCAL_LIBS) rain
-redraw $(LDFLAGS_CURSES) $(LOCAL_LIBS) redraw
-savescreen $(LDFLAGS_CURSES) $(LOCAL_LIBS) savescreen
-tclock $(LDFLAGS_CURSES) $(LOCAL_LIBS) tclock
-test_getstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_getstr
+rain $(LDFLAGS_THREADS) $(LOCAL_LIBS) rain popup_msg
+redraw $(LDFLAGS_CURSES) $(LOCAL_LIBS) redraw popup_msg
+savescreen $(LDFLAGS_CURSES) $(LOCAL_LIBS) savescreen popup_msg
+sp_tinfo $(LDFLAGS_TINFO) $(LOCAL_LIBS) sp_tinfo
+tclock $(LDFLAGS_CURSES_M) $(LOCAL_LIBS) tclock
+test_add_wchstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_add_wchstr
+test_addchstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addchstr
+test_addstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addstr
+test_addwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addwstr
+test_arrays $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_arrays
+test_get_wstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_get_wstr popup_msg
+test_getstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_getstr popup_msg