ncurses 6.1 - patch 20200111

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 0740f2577edb039fbdf104f78b45eda6190f5105..27f7689b7124d6bcd31b428bbf3e856c8d0c6e6a 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.157 2019/03/02 22:18:27 tom Exp $
+# $Id: Makefile.in,v 1.164 2019/11/16 20:42:40 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -126,12 +126,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,11 +159,13 @@ 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 \
        ./comp_captab.c \
+       ./comp_userdefs.c \
        ./expanded.c \
        ./fallback.c \
        ./lib_gen.c \
@@ -220,7 +222,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 >$@
@@ -232,11 +234,13 @@ keys.list :       $(tinfo)/MKkeys_list.sh
        AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@
 
 make_keys$(BUILD_EXEEXT) : \
+               build.priv.h \
                $(tinfo)/make_keys.c \
                names.c
        $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 
 make_hash$(BUILD_EXEEXT) : \
+               build.priv.h \
                $(tinfo)/make_hash.c \
                ../include/hashsize.h
        $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
@@ -257,6 +261,12 @@ report_offsets$(BUILD_EXEEXT) : \
                $(tinfo)/MKcaptab.awk
        $(SHELL) -e $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(CAPLIST) > $@
 
+./comp_userdefs.c: \
+               make_hash$(BUILD_EXEEXT) \
+               ../include/hashsize.h \
+               $(tinfo)/MKuserdefs.sh
+       $(SHELL) -e $(tinfo)/MKuserdefs.sh $(AWK) $(USE_BIG_STRINGS) $(CAPLIST) > $@
+
 ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
        $(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@