ncurses 5.7 - patch 20100703

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index a085538b21b07d6f244731c8ee21d2bc7489dd69..6a89b7e9046fea3e63200a382bcbe66289f81610 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.82 2007/04/19 20:13:32 tom Exp $
+# $Id: Makefile.in,v 1.91 2010/05/15 20:04:40 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2010 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"), #
@@ -55,16 +55,18 @@ 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@
 INSTALL_DATA   = @INSTALL_DATA@
 
 AR             = @AR@
-AR_OPTS                = @AR_OPTS@
+ARFLAGS                = @ARFLAGS@
 
 CXX_AR         = @CXX_AR@
-CXX_AR_OPTS    = @CXX_AR_OPTS@
+CXX_ARFLAGS    = @CXX_ARFLAGS@
 RANLIB         = @LIB_PREP@
 
 CXX            = @CXX@
@@ -75,6 +77,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)
 
@@ -95,7 +100,7 @@ LOCAL_LIBDIR = @top_builddir@/lib
 
 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
 SHLIB_DIRS     = -L../lib
-SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ # @SHLIB_LIST@
+SHLIB_LIST     = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 
 LIBROOT                = ncurses++
 
@@ -111,8 +116,11 @@ LINK_DEBUG = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
 LINK_SHARED    = $(LINK_FLAGS)
 
-LDFLAGS                = @TEST_ARGS@ @LDFLAGS@ \
-       @LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
+TEST_LIBS      = @TEST_LIBS@
+TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
+
+LDFLAGS                = $(TEST_ARGS) @LDFLAGS@ \
+       @LD_MODEL@ $(TEST_LIBS) @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
 
 LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
@@ -135,7 +143,7 @@ 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
@@ -151,14 +159,14 @@ LIB_OBJS = \
        $(MODEL)/cursesmain$o
 
 ../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
-       $(CXX_AR) $(CXX_AR_OPTS) $@ $?
+       $(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) \
-               -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+               $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
 
 OBJS_DEMO = $(MODEL)/demo$o
 
@@ -175,7 +183,7 @@ 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)