ncurses 6.0 - patch 20170204

[ncurses.git] / progs / Makefile.in

diff --git a/progs/Makefile.in b/progs/Makefile.in
index b50c5bf6a2c5ae9ca873828f788027533c6dafd5..a2a6b777c44326e1ea004c7a5284ebdc40c41bdd 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.94 2015/05/01 00:47:26 tom Exp $
+# $Id: Makefile.in,v 1.101 2016/12/31 15:05:18 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2015,2016 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"), #
@@ -42,7 +42,7 @@
 # turn off _all_ suffix rules; we'll generate our own
 .SUFFIXES:
 
-SHELL          = /bin/sh
+SHELL          = @SHELL@
 VPATH          = @srcdir@
 THIS           = Makefile
 
@@ -92,7 +92,7 @@ CPP           = @CPP@
 CFLAGS         = @CFLAGS@
 
 INCDIR         = $(top_srcdir)/include
-CPPFLAGS       = -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H -I../progs @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
@@ -179,6 +179,7 @@ actual_tset      = `echo tset$x|      $(TRANSFORM)`
 
 # transformed names for comparing at runtime
 define_captoinfo = `echo captoinfo|   $(TRANSFORM)`
+define_clear     = `echo clear|       $(TRANSFORM)`
 define_infotocap = `echo infotocap|   $(TRANSFORM)`
 define_init      = `echo init|        $(TRANSFORM)`
 define_reset     = `echo reset|       $(TRANSFORM)`
@@ -188,9 +189,10 @@ transform.h :
        echo "#define __TRANSFORM_H 1"                                  >>$@
        echo "#include <progs.priv.h>"                                  >>$@
        echo "extern bool same_program(const char *, const char *);"    >>$@
-       -sh -c 'if test -n "$x" ; then echo "#define SUFFIX_IGNORED \"$x\"">>$@; fi'
+       -$(SHELL) -c 'if test -n "$x" ; then echo "#define SUFFIX_IGNORED \"$x\"">>$@; fi'
        echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\""           >>$@
        echo "#define PROG_INFOTOCAP \"$(define_infotocap)\""           >>$@
+       echo "#define PROG_CLEAR     \"$(define_clear)\""               >>$@
        echo "#define PROG_RESET     \"$(define_reset)\""               >>$@
        echo "#define PROG_INIT      \"$(define_init)\""                >>$@
        echo "#endif /* __TRANSFORM_H */"                               >>$@
@@ -248,21 +250,27 @@ toe$x: $(DEPS_TOE) $(DEPS_CURSES)
        @ECHO_LD@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
 
 DEPS_CLEAR = \
-       $(MODEL)/clear$o
+       $(MODEL)/clear$o \
+       $(MODEL)/clear_cmd$o \
+       $(MODEL)/tty_settings$o
 
 clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
        @ECHO_LD@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
 
 DEPS_TABS = \
-       $(MODEL)/tabs$o
+       $(MODEL)/tabs$o \
+       $(MODEL)/tty_settings$o
 
 tabs$x: $(DEPS_TABS) $(DEPS_TABS)
        @ECHO_LD@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
 
 DEPS_TPUT = \
        $(MODEL)/tput$o \
+       $(MODEL)/clear_cmd$o \
+       $(MODEL)/reset_cmd$o \
        $(MODEL)/tparm_type$o \
-       $(MODEL)/transform$o
+       $(MODEL)/transform$o \
+       $(MODEL)/tty_settings$o
 
 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
        @ECHO_LD@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
@@ -276,13 +284,15 @@ infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
 
 DEPS_TSET = \
        $(MODEL)/tset$o \
-       $(MODEL)/transform$o
+       $(MODEL)/reset_cmd$o \
+       $(MODEL)/transform$o \
+       $(MODEL)/tty_settings$o
 
 tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
        @ECHO_LD@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
 
 termsort.c: $(srcdir)/MKtermsort.sh
-       sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
+       $(SHELL) $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
 
 #
 # Utility productions start here
@@ -298,7 +308,7 @@ mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
 
 clean :: mostlyclean
-       -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
+       -$(SHELL) -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
        -rm -f $(AUTO_SRC)
        -rm -f $(PROGS)
        -rm -rf .libs *.dSYM