ncurses 5.9 - patch 20150509

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index b69fa81b63c65014be052fe80223b47ab01604f7..eb44da753619616d420d4b071fe5191d3086b1c7 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.107 2014/07/26 22:51:31 tom Exp $
+# $Id: Makefile.in,v 1.110 2015/05/01 00:47:26 tom Exp $

 ##############################################################################
 # Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -44,6 +44,7 @@ o             = .@OBJEXT@
 
 MODEL          = ../@DFT_OBJ_SUBDIR@
 DESTDIR                = @DESTDIR@
 
 MODEL          = ../@DFT_OBJ_SUBDIR@
 DESTDIR                = @DESTDIR@

+top_srcdir     = @top_srcdir@

 srcdir         = @srcdir@
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
 srcdir         = @srcdir@
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@


@@ -54,7 +55,10 @@ includesubdir        = @includesubdir@
 
 INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)
 
 
 INCLUDEDIR     = $(DESTDIR)$(includedir)$(includesubdir)
 

+PACKAGE                = @PACKAGE@
+

 LIBTOOL                = @LIBTOOL_CXX@
 LIBTOOL                = @LIBTOOL_CXX@

+LIBTOOL_OPTS   = @LIBTOOL_OPTS@

 LIBTOOL_CLEAN  = @LIB_CLEAN@
 LIBTOOL_COMPILE        = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@
 LIBTOOL_CLEAN  = @LIB_CLEAN@
 LIBTOOL_COMPILE        = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@


@@ -108,17 +112,17 @@ LOCAL_LIBDIR      = @top_builddir@/lib
 
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
 SHLIB_DIRS     = -L../lib
 
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
 SHLIB_DIRS     = -L../lib

-SHLIB_LIST     = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST     = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@

 
 LIBROOT                = ncurses++
 
 
 LIBROOT                = ncurses++
 

-LIBNAME_LIBTOOL        = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
-LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
+LIBNAME_LIBTOOL        = @LIB_PREFIX@$(LIBROOT)@USE_LIB_SUFFIX@.la
+LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@USE_LIB_SUFFIX@.a

 LIBNAME                = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
 
 LIBRARIES      = @Libs_To_Make@
 
 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)@USE_LIB_SUFFIX@

 RPATH_LIST     = @RPATH_LIST@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 RPATH_LIST     = @RPATH_LIST@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 


@@ -171,7 +175,7 @@ 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) $(LIBRARIES) $(OBJS_DEMO)
        -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
        -rm -rf $(MODEL)/SunWS_cache
        -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) $(LIBRARIES) $(OBJS_DEMO)

-       -rm -rf .libs
+       -rm -rf .libs *.dSYM

 
 distclean :: clean
        -rm -f Makefile
 
 distclean :: clean
        -rm -f Makefile