ncurses 5.7 - patch 20090905

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 3b6b0b8bfe2d0e56eeed675ddc437ad7c1a57d83..14acbef11e2e4c44bf97c98ba9efee72648b5ed7 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.78 2006/10/21 17:07:49 tom Exp $
+# $Id: Makefile.in,v 1.87 2009/03/28 18:22:39 Charles.Wilson Exp $
 ##############################################################################
-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2007,2009 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,15 +55,17 @@ LIBTOOL_COMPILE     = @LIB_COMPILE@
 LIBTOOL_LINK   = @LIB_LINK@
 LIBTOOL_INSTALL        = @LIB_INSTALL@
 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+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@
@@ -74,6 +76,7 @@ CXXLIBS               = @CXXLIBS@
 INCDIR         = ../include
 CPPFLAGS       = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
 
+CC             = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 
 CFLAGS_LIBTOOL = $(CCFLAGS)
@@ -91,9 +94,9 @@ ABI_VERSION   = @cf_cv_abi_version@
 
 LOCAL_LIBDIR   = @top_builddir@/lib
 
-LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) $(CXX) @CXXLDFLAGS@
+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++
 
@@ -109,7 +112,9 @@ LINK_DEBUG  = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
 LINK_SHARED    = $(LINK_FLAGS)
 
-LDFLAGS                = @TEST_ARGS@ @LDFLAGS@ \
+TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
+
+LDFLAGS                = $(TEST_ARGS) @LDFLAGS@ \
        @LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
 
 LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
@@ -149,14 +154,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)
+               -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
 
 OBJS_DEMO = $(MODEL)/demo$o
 
@@ -173,11 +178,11 @@ etip.h:   $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
        sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 
 $(DESTDIR)$(libdir) :
-       sh $(srcdir)/../mkinstalldirs $@
+       sh $(srcdir)/../mkdirs.sh $@
 
 install \
 install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
+       $(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
 
 uninstall \
 uninstall.libs::