ncurses 6.2 - patch 20200212

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index be9cb1991d0a2e3229b75bc1771fb04ad448f29d..b242078804c473ce6bfcee8ea69fa1c451329e54 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,7 @@
-# $Id: Makefile.in,v 1.156 2018/03/01 17:37:19 tom Exp $
+# $Id: Makefile.in,v 1.168 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2017,2018 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@
@@ -155,14 +156,17 @@ FALLBACK_LIST     = @FALLBACK_LIST@
 
 USE_BIG_STRINGS        = @USE_BIG_STRINGS@
 TERMINFO_CAPS  = $(top_srcdir)/include/@TERMINFO_CAPS@
+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 \
@@ -192,9 +196,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
 
@@ -219,7 +224,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 >$@
@@ -228,14 +233,16 @@ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
        ./make_keys$(BUILD_EXEEXT) keys.list > $@
 
 keys.list :    $(tinfo)/MKkeys_list.sh
-       AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
+       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)
@@ -254,16 +261,22 @@ report_offsets$(BUILD_EXEEXT) : \
                ../include/hashsize.h \
                $(tinfo)/MKcaptab.sh \
                $(tinfo)/MKcaptab.awk
-       $(SHELL) -e $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(srcdir)/../include/@TERMINFO_CAPS@ > $@
+       $(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 > $@
 
 ./codes.c: $(tinfo)/MKcodes.awk
-       $(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
+       $(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@
 
 ./names.c: $(tinfo)/MKnames.awk
-       $(AWK) -f $(tinfo)/MKnames.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
+       $(AWK) -f $(tinfo)/MKnames.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@
 
 ./unctrl.c: $(base)/MKunctrl.awk
        echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@
@@ -323,6 +336,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
 ###############################################################################