X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2FMakefile.in;fp=test%2FMakefile.in;h=0abc4aaccae3602a8127ece7ff4fbaa7f90a8641;hp=5358fc21d0cda982667b1ad624c00123ce936b1a;hb=3ef920d65fb2d4046096131d868ae8d4bba79d46;hpb=a6ff7e087fd944fd0035075d0bb528e95e498d81 diff --git a/test/Makefile.in b/test/Makefile.in index 5358fc21..0abc4aac 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.122 2020/02/22 16:51:31 tom Exp $ +# $Id: Makefile.in,v 1.123 2020/03/08 16:15:42 tom Exp $ ############################################################################## # Copyright 2020 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # @@ -122,11 +122,11 @@ LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT) # use these for linking with the (n)curses library and possibly pthreads -LIBS_THREADS = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@ +LIBS_THREADS = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@ LDFLAGS_THREADS = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_THREADS) # use these for linking with the (n)curses library -LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) +LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES) # use these for linking with the tinfo library if we have it, or curses library if not