ncurses 6.2 - patch 20200222

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index a81500ed0bf53091b398ec2db0f09ca735aef559..3969b2c1985101c69ef28c20753d6b2baeeae49b 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,7 @@
-# $Id: Makefile.in,v 1.161 2019/05/11 14:15:21 tom Exp $
+# $Id: Makefile.in,v 1.169 2020/02/22 15:45:23 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -126,12 +127,12 @@ CFLAGS_SHARED     = $(CCFLAGS) @CC_SHARED_OPTS@
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 
 LINK           = $(LIBTOOL)
-LDFLAGS                = @LDFLAGS@ @LD_MODEL@ @LIBS@
+LDFLAGS                = @LDFLAGS@ @LD_MODEL@
 
 SHLIB_DIRS     = -L../lib
-SHLIB_LIST     = $(SHLIB_DIRS) @SHLIB_LIST@
-TINFO_LIST     = $(SHLIB_DIRS) @TINFO_LIST@
-TICS_LIST      = $(SHLIB_DIRS) @TICS_LIST@
+SHLIB_LIST     = $(SHLIB_DIRS) @SHLIB_LIST@ @LIBS@
+TINFO_LIST     = $(SHLIB_DIRS) @TINFO_LIST@ @LIBS@
+TICS_LIST      = $(SHLIB_DIRS) @TICS_LIST@ @LIBS@
 
 RPATH_LIST     = @RPATH_LIST@
 RESULTING_SYMS = @RESULTING_SYMS@
@@ -159,7 +160,8 @@ CAPLIST             = $(TERMINFO_CAPS) $(top_srcdir)/include/Caps-ncurses
 
 TERMINFO       = @TERMINFO@
 TERMINFO_SRC   = @TERMINFO_SRC@
-TIC_PATH       = @TIC_PATH@
+TIC_PATH       = @TIC@
+INFOCMP_PATH   = @INFOCMP@
 
 AUTO_SRC = \
        ./codes.c \
@@ -176,16 +178,21 @@ AUTO_SRC = \
        keys.list
 
 HEADER_DEPS    = \
-       $(srcdir)/curses.priv.h \
-       ../include/ncurses_dll.h \
        ../include/ncurses_cfg.h \
+       ../include/ncurses_def.h \
+       ../include/ncurses_dll.h \
        ../include/curses.h \
-       $(INCDIR)/nc_panel.h \
        ../include/term.h \
-       $(INCDIR)/term_entry.h \
-       $(INCDIR)/nc_tparm.h \
+       ../include/unctrl.h \
        $(INCDIR)/nc_alloc.h \
-       $(INCDIR)/nc_mingw.h
+       $(INCDIR)/nc_mingw.h \
+       $(INCDIR)/nc_panel.h \
+       $(INCDIR)/nc_string.h \
+       $(INCDIR)/nc_termios.h \
+       $(INCDIR)/nc_tparm.h \
+       $(INCDIR)/term_entry.h \
+       $(srcdir)/curses.priv.h \
+       $(srcdir)/new_pair.h
 
 TEST_DEPS      = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
@@ -194,9 +201,10 @@ TEST_LDFLAGS       = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
 TEST_PROGS = \
        captoinfo$x \
        hardscroll$x \
-       link_test$x \
        hashmap$x \
-       lib_mvcur$x
+       lib_mvcur$x \
+       link_test$x \
+       report_hashing$x
 
 LOCAL_LIBDIR   = @top_builddir@/lib
 
@@ -221,7 +229,7 @@ $(DESTDIR)$(libdir) :
 ../lib : ; mkdir $@
 
 ./fallback.c : $(tinfo)/MKfallback.sh
-       $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
+       $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@
 
 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
        $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
@@ -333,6 +341,11 @@ link_test$x : ./link_test.c $(TEST_DEPS) \
 ../@DFT_OBJ_SUBDIR@/dump_entry$o:
        cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o
 
+report_hashing$x : \
+               $(srcdir)/curses.priv.h \
+               $(srcdir)/report_hashing.c $(TEST_DEPS)
+       @ECHO_LD@ $(CC) -o $@ $(CFLAGS_DEFAULT) report_hashing.c $(TEST_LDFLAGS)
+
 ###############################################################################
 # The remainder of this file is automatically generated during configuration
 ###############################################################################