X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2FMakefile.in;h=f4a533b3bfc4312431254a0efb757365381d51aa;hp=5358fc21d0cda982667b1ad624c00123ce936b1a;hb=f3ec084eb66ba14feb6357b674fb85dd474933d8;hpb=a90dd7b66fa711acd24d8181ea20e4f57d4b36cd

diff --git a/test/Makefile.in b/test/Makefile.in
index 5358fc21..f4a533b3 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.124 2020/03/21 16:09:06 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
@@ -138,15 +138,16 @@ LINT_OPTS	= @LINT_OPTS@
 LINT_LIBS	= -lform -lmenu -lpanel -lncurses @LIBS@
 
 INCDIR		= $(top_srcdir)/include
+incdir		= ../include
 
 HEADER_DEPS	= \
-	../include/curses.h \
-	../include/term.h \
-	../include/ncurses_cfg.h \
-	../include/ncurses_def.h \
-	../include/ncurses_dll.h \
-	../include/term.h \
-	../include/unctrl.h \
+	$(incdir)/curses.h \
+	$(incdir)/term.h \
+	$(incdir)/ncurses_cfg.h \
+	$(incdir)/ncurses_def.h \
+	$(incdir)/ncurses_dll.h \
+	$(incdir)/term.h \
+	$(incdir)/unctrl.h \
 	$(INCDIR)/nc_alloc.h
 
 # The rest is generated from the "programs" and "modules" files...