ncurses 5.9 - patch 20130316

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 3b6b0b8bfe2d0e56eeed675ddc437ad7c1a57d83..2bf92a3f61589d2e4b79194d9f53c2ee9456cf6b 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.101 2013/03/13 09:45:11 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2005,2006 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"), #
@@ -35,6 +35,7 @@
 .SUFFIXES:
 
 SHELL          = /bin/sh
+VPATH          = @srcdir@
 
 CF_MFLAGS      = @cf_cv_makeflags@
 @SET_MAKE@
@@ -55,15 +56,21 @@ 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@
+AWK            = @AWK@
+LD             = @LD@
+LN_S           = @LN_S@
 
 CXX_AR         = @CXX_AR@
-CXX_AR_OPTS    = @CXX_AR_OPTS@
+CXX_ARFLAGS    = @CXX_ARFLAGS@
 RANLIB         = @LIB_PREP@
 
 CXX            = @CXX@
@@ -74,6 +81,10 @@ CXXLIBS              = @CXXLIBS@
 INCDIR         = ../include
 CPPFLAGS       = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
 
+CTAGS          = @CTAGS@
+ETAGS          = @ETAGS@
+
+CC             = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 
 CFLAGS_LIBTOOL = $(CCFLAGS)
@@ -91,9 +102,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++
 
@@ -101,16 +112,23 @@ LIBNAME_LIBTOOL   = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
 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@
+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_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)
@@ -124,64 +142,35 @@ AUTO_SRC  = \
                etip.h
 
 all \
-libs ::                $(AUTO_SRC) ../lib/$(LIBNAME)
+libs ::                $(AUTO_SRC) $(LIBRARIES)
 
-all ::         demo$x
+@MAKE_TESTS@all ::             demo$x
 
 sources :      $(AUTO_SRC)
 
 depend :
 
 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_AR_OPTS) $@ $?
-       $(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)
+       $(CTAGS) *.[h] *.cc
 
 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) \
-       ../lib/$(LIBNAME)  \
+       $(LIBRARIES)  \
        @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 $@
        sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 
 $(DESTDIR)$(libdir) :
-       sh $(srcdir)/../mkinstalldirs $@
-
-install \
-install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-
-uninstall \
-uninstall.libs::
-       -$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
+       mkdir -p $@
 
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
@@ -189,7 +178,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) $(LIBRARIES) $(OBJS_DEMO)
        -rm -rf .libs
 
 distclean :: clean