ncurses 5.9 - patch 20120317

[ncurses.git] / c++ / Makefile.in

diff --git a/c++/Makefile.in b/c++/Makefile.in
index c598e48fa112691441cd4c7d8905d3edfbfbb317..3b63aacab10b2a6777e6262267999caf89cadd1f 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.92 2010/09/04 21:29:06 tom Exp $
+# $Id: Makefile.in,v 1.96 2012/03/17 16:45:38 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2011,2012 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"), #
@@ -35,6 +35,7 @@
 .SUFFIXES:
 
 SHELL          = /bin/sh
+VPATH          = @srcdir@
 
 CF_MFLAGS      = @cf_cv_makeflags@
 @SET_MAKE@
@@ -111,6 +112,7 @@ LIBNAME             = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 MY_LIBRARY     = ../lib/$(LIBNAME)
 
 LINK_FLAGS     = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
+RPATH_LIST     = @RPATH_LIST@
 
 LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY)
 LINK_NORMAL    = $(LINK_FLAGS)
@@ -168,7 +170,7 @@ LIB_OBJS = \
        cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
                -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
                -rpath $(INSTALL_PREFIX)$(libdir) \
-               $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
+               $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST)
 
 OBJS_DEMO = $(MODEL)/demo$o
 
@@ -178,7 +180,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
 demo$x:        $(OBJS_DEMO) \
        $(MY_LIBRARY)  \
        @TEST_DEPS@
-       @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+       @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
 
 etip.h:        $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
        cp $(srcdir)/etip.h.in $@