X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2FMakefile.in;h=6a89b7e9046fea3e63200a382bcbe66289f81610;hp=46b4d81c02ae5138b7b1c39868498951bb9ed1fc;hb=43f75d22e281b6230678008b72621a76696f45ba;hpb=4f10f7dff42e5348b814bdce71d3e4d925bd6ed6 diff --git a/c++/Makefile.in b/c++/Makefile.in index 46b4d81c..6a89b7e9 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.88 2010/02/20 20:17:56 tom Exp $ +# $Id: Makefile.in,v 1.91 2010/05/15 20:04:40 tom Exp $ ############################################################################## # Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # # # @@ -55,6 +55,7 @@ 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@ @@ -76,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) @@ -139,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 @@ -162,7 +166,7 @@ LIB_OBJS = \ cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \ -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \ -rpath $(INSTALL_PREFIX)$(libdir) \ - -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST) + $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST) OBJS_DEMO = $(MODEL)/demo$o @@ -179,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)