##############################################################################
-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2008,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"), #
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.61 2008/10/04 22:58:31 tom Exp $
+# $Id: Makefile.in,v 1.63 2009/01/11 01:11:35 tom Exp $
#
.SUFFIXES:
M4 = m4
M4FLAGS = -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@
-ADACURSES_CONFIG = adacurses-config
+ADACURSES_CONFIG = adacurses@DFT_ARG_SUFFIX@-config
WRAPPER = sh $(top_srcdir)/misc/shlib
GENERATE = ./gen$x '@DFT_ARG_SUFFIX@'
sources:
+$(DESTDIR)$(bindir) \
$(ADA_INCLUDE) \
$(ADA_OBJECTS) :
sh $(top_srcdir)/mkdirs.sh $@
@-chmod u+x $(ADA_SRCDIR)/*.ali
install \
-install.libs :: $(DESTDIR)$(bindir) adacurses-config
- $(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
+ $(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
uninstall \
uninstall.libs ::
-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
distclean :: clean
- -rm -f adacurses-config
+ -rm -f $(ADACURSES_CONFIG)
-rm -f Makefile
realclean :: distclean
#! /bin/sh
-# $Id: adacurses-config.in,v 1.2 2007/04/07 21:06:50 tom Exp $
-#
-# This script will return the option to add to `gnatmake' for using
-# AdaCurses.
+# $Id: adacurses-config.in,v 1.5 2009/01/11 00:08:19 tom Exp $
+##############################################################################
+# Copyright (c) 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"), #
+# to deal in the Software without restriction, including without limitation #
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the #
+# following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
+# DEALINGS IN THE SOFTWARE. #
+# #
+# Except as contained in this notice, the name(s) of the above copyright #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written #
+# authorization. #
+##############################################################################
#
+# This script returns the options to add to `gnatmake' for using AdaCurses.
+
+DESTDIR=@DESTDIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
+ADA_INCLUDE=@ADA_INCLUDE@
+ADA_OBJECTS=@ADA_OBJECTS@
-VERSION="@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@"
+VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
-CFLAGS="-I$libdir/adacurses -L$libdir/adacurses"
-LIBS="-L$prefix/lib -lAdaCurses"
+CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS"
+LIBS="-L$ADA_OBJECTS -lAdaCurses"
case "x$1" in
x--version)
;;
x)
# if no parameter is given, give what gnatmake needs
- echo $CFLAGS -largs $LIBS
+ echo "$CFLAGS -i -largs $LIBS"
;;
*)
- echo 'Usage: adacurses-config [--version | --cflags | --libs]' >&2
+ echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2
exit 1
;;
esac
##############################################################################
-# Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2008,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"), #
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.35 2008/11/23 00:17:20 juergen Exp $
+# $Id: Makefile.in,v 1.36 2009/01/11 01:11:54 tom Exp $
#
.SUFFIXES:
CARGS =-cargs $(ADAFLAGS)
LARGS =-largs @TEST_ARG2@ $(LD_FLAGS) -lAdaCurses
-
-PROGS = tour rain ncurses
+
+PROGS = tour rain ncurses
TOUR_OBJS = tour.o sample.o sample-curses_demo.o sample-explanation.o \
sample-form_demo.o sample-function_key_setting.o \
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.32 2009/01/03 19:12:01 tom Exp $
+# $Id: Makefile.in,v 1.34 2009/01/11 01:11:44 tom Exp $
#
.SUFFIXES:
THIS = Makefile
MODEL = ../../@DFT_OBJ_SUBDIR@
+
DESTDIR = @DESTDIR@
+
+top_srcdir = @top_srcdir@
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-ADA_INCLUDE = @ADA_INCLUDE@
+
+ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@
+ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@
INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
AR = @AR@
ARFLAGS = @ARFLAGS@
ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir)
ADAMAKE = @cf_ada_make@
-ADAMAKEFLAGS =
+ADAMAKEFLAGS =
CARGS = -cargs $(ADAFLAGS)
LARGS =
+LIBRARY_FILE = libAdaCurses.a
ALIB = @cf_ada_package@
ABASE = $(ALIB)-curses
$(ABASE)-text_io-complex_io.o
-all :: libAdaCurses.a
+all :: $(LIBRARY_FILE)
@echo done
-libAdaCurses.a :: dotouch $(LIBOBJS) @cf_generic_objects@
+$(LIBRARY_FILE) :: $(LIBOBJS) @cf_generic_objects@
$(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
-dotouch :
- @sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done'
-
sources :
@echo made $@
libs \
install \
-install.libs \
+install.libs :: $(LIBRARY_FILE)
+ @echo made $(LIBRARY_FILE)
+
+install \
+install.libs :: $(LIBRARY_FILE)
+ @$(top_srcdir)/tar-copy.sh $(LIBRARY_FILE) . $(ADA_OBJECTS)
+ @echo made $@
+
uninstall \
uninstall.libs ::
@echo made $@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1353 2009/01/06 00:26:35 tom Exp $
+-- $Id: NEWS,v 1.1356 2009/01/11 00:49:55 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20090110
+ + add screen.Eterm terminfo entry (GenToo #124887) -TD
+ + modify adacurses-config to look for ".ali" files in the adalib
+ directory.
+ + correct install for Ada95, which omitted libAdaCurses.a used in
+ adacurses-config
+ + change install for adacurses-config to provide additional flavors
+ such as adacursesw-config, for ncursesw (GenToo #167849).
+
20090105
+ remove undeveloped feature in ncurses-config.in for setting
prefix variable.
#! /bin/sh
-# From configure.in Revision: 1.463 .
+# From configure.in Revision: 1.464 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20081225.
#
fi
if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
- SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
+ SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
fi
DIRS_TO_MAKE="lib"
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.463 2009/01/06 01:40:09 tom Exp $
+dnl $Id: configure.in,v 1.464 2009/01/10 19:18:03 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.463 $)
+AC_REVISION($Revision: 1.464 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
CF_SRC_MODULES($modules_to_build)
if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
- SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
+ SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
fi
CF_DIRS_TO_MAKE
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.681 2009/01/05 23:52:40 tom Exp $
+# $Id: dist.mk,v 1.682 2009/01/10 16:06:37 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
-NCURSES_PATCH = 20090105
+NCURSES_PATCH = 20090110
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.343 $
-# $Date: 2008/11/29 15:27:35 $
+# $Revision: 1.345 $
+# $Date: 2009/01/11 00:47:37 $
#
# The original header is preserved below for reference. It is noted that there
# is a "newer" version which differs in some cosmetic details (but actually
cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
kcuu1=\EOA, use=screen+fkeys, use=vt100+enq,
use=rxvt+pcfkeys, use=vt220+keypad, use=screen,
+screen.Eterm|screen in Eterm,
+ use=screen+fkeys, use=Eterm,
# fix the backspace key
screen.linux|screen in linux console,
bw,
# 2008-11-29
# * add eterm-color -TD
#
+# 2009-01-10
+# * add screen.Eterm -TD
+#
# The following sets edit modes for GNU EMACS.
# Local Variables:
# fill-prefix:"\t"
projects / ncurses.git / commitdiff