ncurses 5.9 - patch 20120825

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index fa2023c3c51ac81f29f687925b642ee4a8fdae27..3b63aacab10b2a6777e6262267999caf89cadd1f 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.94 2011/07/02 18:04:05 tom Exp $
+# $Id: Makefile.in,v 1.96 2012/03/17 16:45:38 tom Exp $

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

-# Copyright (c) 1998-2010,2011 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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -112,6 +112,7 @@ LIBNAME             = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 MY_LIBRARY     = ../lib/$(LIBNAME)
 
 LINK_FLAGS     = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@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)
 
 LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY)
 LINK_NORMAL    = $(LINK_FLAGS)


@@ -179,7 +180,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
 demo$x:        $(OBJS_DEMO) \
        $(MY_LIBRARY)  \
        @TEST_DEPS@
 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 $@
 
 etip.h:        $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
        cp $(srcdir)/etip.h.in $@