ncurses 5.9 - patch 20130316

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 6a89b7e9046fea3e63200a382bcbe66289f81610..2bf92a3f61589d2e4b79194d9f53c2ee9456cf6b 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.91 2010/05/15 20:04:40 tom Exp $
+# $Id: Makefile.in,v 1.101 2013/03/13 09:45:11 tom Exp $

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

-# Copyright (c) 1998-2009,2010 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"), #
 #                                                                            #
 # 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
 .SUFFIXES:
 
 SHELL          = /bin/sh

+VPATH          = @srcdir@

 
 CF_MFLAGS      = @cf_cv_makeflags@
 @SET_MAKE@
 
 CF_MFLAGS      = @cf_cv_makeflags@
 @SET_MAKE@


@@ -64,6 +65,9 @@ INSTALL_DATA  = @INSTALL_DATA@
 
 AR             = @AR@
 ARFLAGS                = @ARFLAGS@
 
 AR             = @AR@
 ARFLAGS                = @ARFLAGS@

+AWK            = @AWK@
+LD             = @LD@
+LN_S           = @LN_S@

 
 CXX_AR         = @CXX_AR@
 CXX_ARFLAGS    = @CXX_ARFLAGS@
 
 CXX_AR         = @CXX_AR@
 CXX_ARFLAGS    = @CXX_ARFLAGS@


@@ -108,9 +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@
 
 LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
 LIBNAME                = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 

+LIBRARIES      = @Libs_To_Make@
+

 LINK_FLAGS     = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
 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 ../lib/$(LIBNAME)
+LINK_LIBTOOL   = @EXTRA_LDFLAGS@ -L../lib $(LIBRARIES)

 LINK_NORMAL    = $(LINK_FLAGS)
 LINK_DEBUG     = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
 LINK_NORMAL    = $(LINK_FLAGS)
 LINK_DEBUG     = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)


@@ -134,9 +142,9 @@ AUTO_SRC    = \
                etip.h
 
 all \
                etip.h
 
 all \

-libs ::                $(AUTO_SRC) ../lib/$(LIBNAME)
+libs ::                $(AUTO_SRC) $(LIBRARIES)

 
 

-all ::         demo$x
+@MAKE_TESTS@all ::             demo$x

 
 sources :      $(AUTO_SRC)
 
 
 sources :      $(AUTO_SRC)
 


@@ -145,38 +153,17 @@ depend :
 tags:
        $(CTAGS) *.[h] *.cc
 
 tags:
        $(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
-# dependencies.
-LIB_OBJS = \
-       $(MODEL)/cursesf$o \
-       $(MODEL)/cursesm$o \
-       $(MODEL)/cursesw$o \
-       $(MODEL)/cursespad$o \
-       $(MODEL)/cursesp$o \
-       $(MODEL)/cursslk$o \
-       $(MODEL)/cursesapp$o \
-       $(MODEL)/cursesmain$o
-
-../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
-       $(CXX_AR) $(CXX_ARFLAGS) $@ $?
-       $(RANLIB) $@
-
-../lib/$(LIBNAME_LIBTOOL) : $(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)
-

 OBJS_DEMO = $(MODEL)/demo$o
 
 $(MODEL)/demo$o : $(srcdir)/demo.cc \
        $(cursesf_h) $(cursesm_h) $(cursesapp_h)
 OBJS_DEMO = $(MODEL)/demo$o
 
 $(MODEL)/demo$o : $(srcdir)/demo.cc \
        $(cursesf_h) $(cursesm_h) $(cursesapp_h)

+       @echo 'compiling demo (obj_s)'
+       @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@

 
 demo$x:        $(OBJS_DEMO) \
 
 demo$x:        $(OBJS_DEMO) \

-       ../lib/$(LIBNAME)  \
+       $(LIBRARIES)  \

        @TEST_DEPS@
        @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 $@


@@ -185,21 +172,13 @@ etip.h:   $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 

-install \
-install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-
-uninstall \
-uninstall.libs::
-       -$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
-

 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
 
 clean :: mostlyclean
        -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
        -rm -rf $(MODEL)/SunWS_cache
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
 
 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) $(LIBRARIES) $(OBJS_DEMO)

        -rm -rf .libs
 
 distclean :: clean
        -rm -rf .libs
 
 distclean :: clean