ncurses 5.7 - patch 20100417

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

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 14acbef11e2e4c44bf97c98ba9efee72648b5ed7..83049ec9629fdbe2928f924b8c3d3f022fdf6a49 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.87 2009/03/28 18:22:39 Charles.Wilson Exp $
+# $Id: Makefile.in,v 1.89 2010/04/03 15:23:13 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2007,2009 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"), #
@@ -76,6 +76,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)
 
@@ -112,10 +115,11 @@ LINK_DEBUG        = $(LINK_FLAGS)
 LINK_PROFILE   = $(LINK_FLAGS)
 LINK_SHARED    = $(LINK_FLAGS)
 
+TEST_LIBS      = @TEST_LIBS@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
 
 LDFLAGS                = $(TEST_ARGS) @LDFLAGS@ \
-       @LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
+       @LD_MODEL@ $(TEST_LIBS) @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
 
 LDFLAGS_LIBTOOL        = $(LDFLAGS) $(CFLAGS_LIBTOOL)
 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
@@ -138,7 +142,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