ncurses 5.8 - patch 20110307

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 6a89b7e9046fea3e63200a382bcbe66289f81610..6fd8ffc55f2aab2802ae7db56d51056ff96d34c8 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.91 2010/05/15 20:04:40 tom Exp $
+# $Id: Makefile.in,v 1.93 2010/11/27 21:45:27 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -35,6 +35,7 @@
 .SUFFIXES:
 
 SHELL          = /bin/sh
+VPATH          = @srcdir@
 
 CF_MFLAGS      = @cf_cv_makeflags@
 @SET_MAKE@
@@ -108,9 +109,11 @@ LIBNAME_LIBTOOL    = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
 LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
 LIBNAME                = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 
+MY_LIBRARY     = ../lib/$(LIBNAME)
+
 LINK_FLAGS     = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
 
-LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
+LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY)
 LINK_NORMAL    = $(LINK_FLAGS)
 LINK_DEBUG     = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
@@ -134,9 +137,9 @@ AUTO_SRC    = \
                etip.h
 
 all \
-libs ::                $(AUTO_SRC) ../lib/$(LIBNAME)
+libs ::                $(AUTO_SRC) $(MY_LIBRARY)
 
-all ::         demo$x
+@MAKE_TESTS@all ::             demo$x
 
 sources :      $(AUTO_SRC)
 
@@ -174,7 +177,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
        $(cursesf_h) $(cursesm_h) $(cursesapp_h)
 
 demo$x:        $(OBJS_DEMO) \
-       ../lib/$(LIBNAME)  \
+       $(MY_LIBRARY)  \
        @TEST_DEPS@
        @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
 
@@ -186,8 +189,8 @@ $(DESTDIR)$(libdir) :
        mkdir -p $@
 
 install \
-install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
+install.libs:: $(MY_LIBRARY) $(DESTDIR)$(libdir)
+       $(LIBTOOL_INSTALL) $(INSTALL_LIB) $(MY_LIBRARY) $(DESTDIR)$(libdir)/$(LIBNAME)
 
 uninstall \
 uninstall.libs::
@@ -199,7 +202,7 @@ mostlyclean ::
 clean :: mostlyclean
        -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
        -rm -rf $(MODEL)/SunWS_cache
-       -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
+       -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) $(MY_LIBRARY) $(LIB_OBJS) $(OBJS_DEMO)
        -rm -rf .libs
 
 distclean :: clean