ncurses 5.9 - patch 20111217

[ncurses.git] / progs / Makefile.in

diff --git a/progs/Makefile.in b/progs/Makefile.in
index b9d3131cfff205d9671b0cb55b491d4b62ae4caf..5d48e2d381f79ff99960b2a6a5ea583ea08a1c52 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.82 2009/03/28 20:30:58 tom Exp $
+# $Id: Makefile.in,v 1.87 2011/09/24 15:13:34 nix Exp $

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

-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 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"), #


@@ -43,6 +43,7 @@
 .SUFFIXES:
 
 SHELL          = /bin/sh
 .SUFFIXES:
 
 SHELL          = /bin/sh

+VPATH          = @srcdir@

 THIS           = Makefile
 
 CF_MFLAGS      = @cf_cv_makeflags@
 THIS           = Makefile
 
 CF_MFLAGS      = @cf_cv_makeflags@


@@ -76,6 +77,9 @@ transform     = @program_transform_name@
 AWK            = @AWK@
 LN_S           = @LN_S@
 
 AWK            = @AWK@
 LN_S           = @LN_S@
 

+CTAGS          = @CTAGS@
+ETAGS          = @ETAGS@
+

 CC             = @CC@
 CPP            = @CPP@
 CFLAGS         = @CFLAGS@
 CC             = @CC@
 CPP            = @CPP@
 CFLAGS         = @CFLAGS@


@@ -100,20 +104,21 @@ LOCAL_LIBDIR      = @top_builddir@/lib
 LD             = @LD@
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK)
 LDFLAGS                = @EXTRA_LDFLAGS@ @LDFLAGS@
 LD             = @LD@
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK)
 LDFLAGS                = @EXTRA_LDFLAGS@ @LDFLAGS@

+RPATH_LIST     = @RPATH_LIST@

 
 LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
 LDFLAGS_DEBUG  = $(LDFLAGS) $(CFLAGS_DEBUG)
 
 LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
 LDFLAGS_DEBUG  = $(LDFLAGS) $(CFLAGS_DEBUG)

-LDFLAGS_PROFILE        = $(LDFLAGS) $(CFLAGS_PROFILE) 
+LDFLAGS_PROFILE        = $(LDFLAGS) $(CFLAGS_PROFILE)

 LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
 
 LDFLAGS_DEFAULT        = $(LDFLAGS_@DFT_UPR_MODEL@)
 
 LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
 
 LDFLAGS_DEFAULT        = $(LDFLAGS_@DFT_UPR_MODEL@)
 

-LIBS_TIC       = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-LDFLAGS_TIC    = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
+LIBS_TIC       = @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
+LDFLAGS_TIC    = @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)

 
 

-LIBS_TINFO     = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-LDFLAGS_TINFO  = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
+LIBS_TINFO     = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
+LDFLAGS_TINFO  = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)

 
 LINT           = @LINT@
 LINT_OPTS      = @LINT_OPTS@
 
 LINT           = @LINT@
 LINT_OPTS      = @LINT_OPTS@


@@ -214,7 +219,7 @@ uninstall.progs:
        -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
 
 $(DESTDIR)$(bindir) :
        -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
 
 $(DESTDIR)$(bindir) :

-       sh $(srcdir)/../mkdirs.sh $@
+       mkdir -p $@

 
 #
 # Utilities normally built by make all start here
 
 #
 # Utilities normally built by make all start here


@@ -275,10 +280,10 @@ termsort.c: $(srcdir)/MKtermsort.sh
 #
 
 tags:
 #
 
 tags:

-       ctags *.[ch]
+       $(CTAGS) *.[ch]

 
 @MAKE_UPPER_TAGS@TAGS:
 
 @MAKE_UPPER_TAGS@TAGS:

-@MAKE_UPPER_TAGS@      etags *.[ch]
+@MAKE_UPPER_TAGS@      $(ETAGS) *.[ch]

 
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
 
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace