ncurses 6.0 - patch 20151101

[ncurses.git] / progs / Makefile.in

diff --git a/progs/Makefile.in b/progs/Makefile.in
index a9161b16cbcac41388aa239e4abd1510b4032c68..663a5a084af1634306215578b0669ab261d4b5c6 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.90 2013/08/04 20:23:20 tom Exp $
+# $Id: Makefile.in,v 1.95 2015/08/05 09:24:06 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2014,2015 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
 
@@ -67,7 +67,10 @@ includesubdir        = @includesubdir@
 
 INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)
 
+PACKAGE                = @PACKAGE@
+
 LIBTOOL                = @LIBTOOL@
+LIBTOOL_OPTS   = @LIBTOOL_OPTS@
 LIBTOOL_CLEAN  = @LIB_CLEAN@
 LIBTOOL_COMPILE        = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@
@@ -89,7 +92,7 @@ CPP           = @CPP@
 CFLAGS         = @CFLAGS@
 
 INCDIR         = $(top_srcdir)/include
-CPPFLAGS       = -I../progs -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
@@ -185,7 +188,7 @@ 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_RESET     \"$(define_reset)\""               >>$@
@@ -232,6 +235,7 @@ $(DESTDIR)$(bindir) :
 DEPS_TIC = \
        $(MODEL)/tic$o \
        $(MODEL)/dump_entry$o \
+       $(MODEL)/tparm_type$o \
        $(MODEL)/transform$o
 
 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
@@ -257,6 +261,7 @@ tabs$x: $(DEPS_TABS) $(DEPS_TABS)
 
 DEPS_TPUT = \
        $(MODEL)/tput$o \
+       $(MODEL)/tparm_type$o \
        $(MODEL)/transform$o
 
 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
@@ -277,7 +282,7 @@ 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
@@ -293,10 +298,10 @@ 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
+       -rm -rf .libs *.dSYM
 
 distclean :: clean
        -rm -f Makefile