ncurses 5.9 - patch 20111210

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index cf023000d279987b91d07d601568e20061337a69..889829c97fce35b88e2f46355f7ca08f10772f53 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.86 2009/03/21 20:02:11 Charles.Wilson Exp $
+# $Id: Makefile.in,v 1.95 2011/07/30 22:52:07 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2007,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"), #
@@ -35,6 +35,7 @@
 .SUFFIXES:
 
 SHELL          = /bin/sh
+VPATH          = @srcdir@
 
 CF_MFLAGS      = @cf_cv_makeflags@
 @SET_MAKE@
@@ -55,6 +56,8 @@ LIBTOOL_COMPILE       = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@
 LIBTOOL_INSTALL        = @LIB_INSTALL@
 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+LIBTOOL_VERSION = @LIBTOOL_VERSION@
+LT_UNDEF       = @LT_UNDEF@
 
 INSTALL                = @INSTALL@
 INSTALL_LIB    = @INSTALL@ @INSTALL_LIB@
@@ -75,6 +78,9 @@ CXXLIBS               = @CXXLIBS@
 INCDIR         = ../include
 CPPFLAGS       = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
 
+CTAGS          = @CTAGS@
+ETAGS          = @ETAGS@
+
 CC             = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 
@@ -103,18 +109,22 @@ 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@
+RPATH_LIST     = @RPATH_LIST@
 
-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)
 LINK_SHARED    = $(LINK_FLAGS)
 
+TEST_LIBS      = @TEST_LIBS@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
 
 LDFLAGS                = $(TEST_ARGS) @LDFLAGS@ \
-       @LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
+       @LD_MODEL@ $(TEST_LIBS) @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
 
 LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
@@ -128,16 +138,16 @@ 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)
 
 depend :
 
 tags:
-       ctags *.[h] *.cc
+       $(CTAGS) *.[h] *.cc
 
 # Build a conventional library for installing, since a shared library would
 # pull in all of the ncurses libraries (panel, menu, form, ncurses) as direct
@@ -160,7 +170,7 @@ LIB_OBJS = \
        cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
                -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
                -rpath $(INSTALL_PREFIX)$(libdir) \
-               -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+               $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST)
 
 OBJS_DEMO = $(MODEL)/demo$o
 
@@ -168,7 +178,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)
 
@@ -177,11 +187,11 @@ etip.h:   $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
        sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 
 $(DESTDIR)$(libdir) :
-       sh $(srcdir)/../mkdirs.sh $@
+       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::
@@ -193,7 +203,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