ncurses 6.0 - patch 20170715

[ncurses.git] / progs / Makefile.in

diff --git a/progs/Makefile.in b/progs/Makefile.in
index 23c6e5e8850ae032918feb1cf572c8e23ea4eed5..a2a6b777c44326e1ea004c7a5284ebdc40c41bdd 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.88 2012/03/17 16:45:38 tom Exp $
+# $Id: Makefile.in,v 1.101 2016/12/31 15:05:18 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2011,2012 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"), #
 #                                                                            #
 # 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:
 
 # turn off _all_ suffix rules; we'll generate our own
 .SUFFIXES:
 

-SHELL          = /bin/sh
+SHELL          = @SHELL@

 VPATH          = @srcdir@
 THIS           = Makefile
 
 VPATH          = @srcdir@
 THIS           = Makefile
 


@@ -61,9 +61,16 @@ exec_prefix  = @exec_prefix@
 bindir         = @bindir@
 libdir         = @libdir@
 includedir     = @includedir@
 bindir         = @bindir@
 libdir         = @libdir@
 includedir     = @includedir@

+datarootdir    = @datarootdir@

 datadir                = @datadir@
 datadir                = @datadir@

+includesubdir  = @includesubdir@
+
+INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)
+
+PACKAGE                = @PACKAGE@

 
 LIBTOOL                = @LIBTOOL@
 
 LIBTOOL                = @LIBTOOL@

+LIBTOOL_OPTS   = @LIBTOOL_OPTS@

 LIBTOOL_CLEAN  = @LIB_CLEAN@
 LIBTOOL_COMPILE        = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@
 LIBTOOL_CLEAN  = @LIB_CLEAN@
 LIBTOOL_COMPILE        = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@


@@ -85,7 +92,7 @@ CPP           = @CPP@
 CFLAGS         = @CFLAGS@
 
 INCDIR         = $(top_srcdir)/include
 CFLAGS         = @CFLAGS@
 
 INCDIR         = $(top_srcdir)/include

-CPPFLAGS       = -I../progs -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H -I../progs @CPPFLAGS@

 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 


@@ -172,6 +179,7 @@ actual_tset      = `echo tset$x|      $(TRANSFORM)`
 
 # transformed names for comparing at runtime
 define_captoinfo = `echo captoinfo|   $(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)`
 define_infotocap = `echo infotocap|   $(TRANSFORM)`
 define_init      = `echo init|        $(TRANSFORM)`
 define_reset     = `echo reset|       $(TRANSFORM)`


@@ -181,9 +189,10 @@ transform.h :
        echo "#define __TRANSFORM_H 1"                                  >>$@
        echo "#include <progs.priv.h>"                                  >>$@
        echo "extern bool same_program(const char *, const char *);"    >>$@
        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_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 */"                               >>$@
        echo "#define PROG_RESET     \"$(define_reset)\""               >>$@
        echo "#define PROG_INIT      \"$(define_init)\""                >>$@
        echo "#endif /* __TRANSFORM_H */"                               >>$@


@@ -228,6 +237,7 @@ $(DESTDIR)$(bindir) :
 DEPS_TIC = \
        $(MODEL)/tic$o \
        $(MODEL)/dump_entry$o \
 DEPS_TIC = \
        $(MODEL)/tic$o \
        $(MODEL)/dump_entry$o \

+       $(MODEL)/tparm_type$o \

        $(MODEL)/transform$o
 
 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
        $(MODEL)/transform$o
 
 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h


@@ -240,20 +250,27 @@ toe$x: $(DEPS_TOE) $(DEPS_CURSES)
        @ECHO_LD@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
 
 DEPS_CLEAR = \
        @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 = \
 
 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 \
 
 tabs$x: $(DEPS_TABS) $(DEPS_TABS)
        @ECHO_LD@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
 
 DEPS_TPUT = \
        $(MODEL)/tput$o \

-       $(MODEL)/transform$o
+       $(MODEL)/clear_cmd$o \
+       $(MODEL)/reset_cmd$o \
+       $(MODEL)/tparm_type$o \
+       $(MODEL)/transform$o \
+       $(MODEL)/tty_settings$o

 
 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
        @ECHO_LD@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
 
 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
        @ECHO_LD@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@


@@ -267,13 +284,15 @@ infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
 
 DEPS_TSET = \
        $(MODEL)/tset$o \
 
 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
 
 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
 
 #
 # Utility productions start here


@@ -289,10 +308,10 @@ mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
 
 clean :: 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 -f $(AUTO_SRC)
        -rm -f $(PROGS)

-       -rm -rf .libs
+       -rm -rf .libs *.dSYM

 
 distclean :: clean
        -rm -f Makefile
 
 distclean :: clean
        -rm -f Makefile