ncurses 5.9 - patch 20130309

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 3b63aacab10b2a6777e6262267999caf89cadd1f..08dc9c92dca4e9390b5c569a3c1652008cd27d94 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.96 2012/03/17 16:45:38 tom Exp $
+# $Id: Makefile.in,v 1.97 2013/03/09 21:22:49 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2012,2013 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"), #
@@ -65,6 +65,9 @@ INSTALL_DATA  = @INSTALL_DATA@
 
 AR             = @AR@
 ARFLAGS                = @ARFLAGS@
+AWK            = @AWK@
+LD             = @LD@
+LN_S           = @LN_S@
 
 CXX_AR         = @CXX_AR@
 CXX_ARFLAGS    = @CXX_ARFLAGS@
@@ -109,12 +112,13 @@ 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)
+LIBRARIES      = @Libs_To_Make@
 
 LINK_FLAGS     = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
 RPATH_LIST     = @RPATH_LIST@
+MK_SHARED_LIB  = @MK_SHARED_LIB@
 
-LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY)
+LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib $(LIBRARIES)
 LINK_NORMAL    = $(LINK_FLAGS)
 LINK_DEBUG     = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
@@ -138,7 +142,7 @@ AUTO_SRC    = \
                etip.h
 
 all \
-libs ::                $(AUTO_SRC) $(MY_LIBRARY)
+libs ::                $(AUTO_SRC) $(LIBRARIES)
 
 @MAKE_TESTS@all ::             demo$x
 
@@ -178,7 +182,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
        $(cursesf_h) $(cursesm_h) $(cursesapp_h)
 
 demo$x:        $(OBJS_DEMO) \
-       $(MY_LIBRARY)  \
+       $(LIBRARIES)  \
        @TEST_DEPS@
        @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
 
@@ -190,8 +194,8 @@ $(DESTDIR)$(libdir) :
        mkdir -p $@
 
 install \
-install.libs:: $(MY_LIBRARY) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL_LIB) $(MY_LIBRARY) $(DESTDIR)$(libdir)/$(LIBNAME)
+install.libs:: $(LIBRARIES) $(DESTDIR)$(libdir)
+       $(LIBTOOL_INSTALL) $(INSTALL_LIB) $(LIBRARIES) $(DESTDIR)$(libdir)/$(LIBNAME)
 
 uninstall \
 uninstall.libs::
@@ -203,7 +207,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) $(MY_LIBRARY) $(LIB_OBJS) $(OBJS_DEMO)
+       -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) $(LIBRARIES) $(LIB_OBJS) $(OBJS_DEMO)
        -rm -rf .libs
 
 distclean :: clean