[agd-cvs] server install-sh,NONE,1.1 Makefile.in,1.1,1.2

[<so...@us...>]

Update of /cvsroot/agd/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25494

Modified Files:
	Makefile.in 
Added Files:
	install-sh 
Log Message:

Added install-sh script, trying if this works.


--- NEW FILE: install-sh ---
#!/bin/sh
#
# install - install a program, script, or datafile
#
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright (C) 1994 X Consortium
#
# 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, 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
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.  It can only install one file at a time, a restriction
# shared with many OS's install programs.


# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"


# put in absolute paths if you don't have them in your path; or use env. vars.

mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"

transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""

while [ x"$1" != x ]; do
    case $1 in
	-c) instcmd=$cpprog
	    shift
	    continue;;

	-d) dir_arg=true
	    shift
	    continue;;

	-m) chmodcmd="$chmodprog $2"
	    shift
	    shift
	    continue;;

	-o) chowncmd="$chownprog $2"
	    shift
	    shift
	    continue;;

	-g) chgrpcmd="$chgrpprog $2"
	    shift
	    shift
	    continue;;

	-s) stripcmd=$stripprog
	    shift
	    continue;;

	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
	    shift
	    continue;;

	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
	    shift
	    continue;;

	*)  if [ x"$src" = x ]
	    then
		src=$1
	    else
		# this colon is to work around a 386BSD /bin/sh bug
		:
		dst=$1
	    fi
	    shift
	    continue;;
    esac
done

if [ x"$src" = x ]
then
	echo "$0: no input file specified" >&2
	exit 1
else
	:
fi

if [ x"$dir_arg" != x ]; then
	dst=$src
	src=""

	if [ -d "$dst" ]; then
		instcmd=:
		chmodcmd=""
	else
		instcmd=$mkdirprog
	fi
else

# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.

	if [ -f "$src" ] || [ -d "$src" ]
	then
		:
	else
		echo "$0: $src does not exist" >&2
		exit 1
	fi

	if [ x"$dst" = x ]
	then
		echo "$0: no destination specified" >&2
		exit 1
	else
		:
	fi

# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic

	if [ -d "$dst" ]
	then
		dst=$dst/`basename "$src"`
	else
		:
	fi
fi

## this sed command emulates the dirname command
dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

# Make sure that the destination directory exists.
#  this part is taken from Noah Friedman's mkinstalldirs script

# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
	'
IFS="${IFS-$defaultIFS}"

oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS=$oIFS

pathcomp=''

while [ $# -ne 0 ] ; do
	pathcomp=$pathcomp$1
	shift

	if [ ! -d "$pathcomp" ] ;
        then
		$mkdirprog "$pathcomp"
	else
		:
	fi

	pathcomp=$pathcomp/
done
fi

if [ x"$dir_arg" != x ]
then
	$doit $instcmd "$dst" &&

	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
else

# If we're going to rename the final executable, determine the name now.

	if [ x"$transformarg" = x ]
	then
		dstfile=`basename "$dst"`
	else
		dstfile=`basename "$dst" $transformbasename |
			sed $transformarg`$transformbasename
	fi

# don't allow the sed command to completely eliminate the filename

	if [ x"$dstfile" = x ]
	then
		dstfile=`basename "$dst"`
	else
		:
	fi

# Make a couple of temp file names in the proper directory.

	dsttmp=$dstdir/_inst.$$_
	rmtmp=$dstdir/_rm.$$_

# Trap to clean up temp files at exit.

	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
	trap '(exit $?); exit' 1 2 13 15

# Move or copy the file name to the temp name

	$doit $instcmd "$src" "$dsttmp" &&

# and set any options; do chmod last to preserve setuid bits

# If any of these fail, we abort the whole thing.  If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.

	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&

# Now remove or move aside any old file at destination location.  We try this
# two ways since rm can't unlink itself on some systems and the destination
# file might be busy for other reasons.  In this case, the final cleanup
# might fail but the new file should still install successfully.

{
	if [ -f "$dstdir/$dstfile" ]
	then
		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
		{
		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
		  (exit 1); exit
		}
	else
		:
	fi
} &&

# Now rename the file to the real destination.

	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"

fi &&

# The final little trick to "correctly" pass the exit status to the exit trap.

{
	(exit 0); exit
}

Index: Makefile.in
===================================================================
RCS file: /cvsroot/agd/server/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in	12 Mar 2004 11:51:44 -0000	1.1
--- Makefile.in	12 Mar 2004 14:20:39 -0000	1.2
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 13,33 ****
  # PARTICULAR PURPOSE.
  
! @SET_MAKE@
  
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
  NORMAL_INSTALL = :
  PRE_INSTALL = :
--- 11,55 ----
  # PARTICULAR PURPOSE.
  
! 
! SHELL = @SHELL@
  
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ 
+ DESTDIR =
+ 
  pkgdatadir = $(datadir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
+ 
  top_builddir = .
  
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
! 
  INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
! 
  NORMAL_INSTALL = :
  PRE_INSTALL = :
***************
*** 36,153 ****
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@
- CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
! CPP = @CPP@
! CPPFLAGS = @CPPFLAGS@
  CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
  DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
  LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
- OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
- bindir = @bindir@
- build_alias = @build_alias@
- datadir = @datadir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
- includedir = @includedir@
- infodir = @infodir@
  install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
  
  EXTRA_DIST = AUTHORS BUGS ChangeLog COPYING ExitValues Ideas INSTALL NEWS README README.ARCH TODO lib doc
  SUBDIRS = src
- subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/src/config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
  
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- 	ps-recursive install-info-recursive uninstall-info-recursive \
- 	all-recursive install-data-recursive install-exec-recursive \
- 	installdirs-recursive install-recursive uninstall-recursive \
- 	check-recursive installcheck-recursive
- DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- 	COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
- 	configure.ac depcomp install-sh missing mkinstalldirs ylwrap
- DIST_SUBDIRS = $(SUBDIRS)
- all: all-recursive
  
  .SUFFIXES:
  
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
!  configure.lineno
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
! 	cd $(top_srcdir) && \
! 	  $(AUTOMAKE) --gnu  Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
  
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
  
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac 
! 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
! uninstall-info-am:
  
  # This directory's subdirectories are mostly independent; you can cd
--- 58,143 ----
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
! AMDEPBACKSLASH = @AMDEPBACKSLASH@
  AMTAR = @AMTAR@
  AWK = @AWK@
  CC = @CC@
  CFLAGS = @CFLAGS@
! CXX = @CXX@
  CYGPATH_W = @CYGPATH_W@
  DEPDIR = @DEPDIR@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LEX = @LEX@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
  PACKAGE = @PACKAGE@
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
  install_sh = @install_sh@
  
  EXTRA_DIST = AUTHORS BUGS ChangeLog COPYING ExitValues Ideas INSTALL NEWS README README.ARCH TODO lib doc
  SUBDIRS = src
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ./src/config.h $@)]
! CONFIG_CLEAN_FILES = 
! DIST_COMMON =  README ./stamp-h2.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS TODO aclocal.m4 configure configure.ac \
! install-sh missing mkinstalldirs ylwrap
  
  
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+ TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
  .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
  
! Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
! 	cd $(top_builddir) \
! 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac 
! 	cd $(srcdir) && $(ACLOCAL)
! 
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
  
! )]: stamp-h2
! 	@if test ! -f $@; then \
! 		rm -f stamp-h2; \
! 		$(MAKE) stamp-h2; \
! 	else :; fi
! stamp-h2: $(srcdir)/)].in $(top_builddir)/config.status
! 	cd $(top_builddir) \
! 	  && CONFIG_FILES= CONFIG_HEADERS=)] \
! 	     $(SHELL) ./config.status
! 	@echo timestamp > stamp-h2 2> /dev/null
! $(srcdir)/)].in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h2.in
! 	@if test ! -f $@; then \
! 		rm -f $(srcdir)/stamp-h2.in; \
! 		$(MAKE) $(srcdir)/stamp-h2.in; \
! 	else :; fi
! $(srcdir)/stamp-h2.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
! 	cd $(top_srcdir) && $(AUTOHEADER)
! 	@echo timestamp > $(srcdir)/stamp-h2.in 2> /dev/null
! 
! mostlyclean-hdr:
! 
! clean-hdr:
! 
! distclean-hdr:
! 	-rm -f )]
! 
! maintainer-clean-hdr:
  
  # This directory's subdirectories are mostly independent; you can cd
***************
*** 157,162 ****
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
! 	@set fnord $$MAKEFLAGS; amf=$$2; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
--- 147,157 ----
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
! 
! @SET_MAKE@
! 
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive  \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
! 	@set fnord $(MAKEFLAGS); amf=$$2; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
***************
*** 178,193 ****
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
! 	@set fnord $$MAKEFLAGS; amf=$$2; \
  	dot_seen=no; \
! 	case "$@" in \
! 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! 	  *) list='$(SUBDIRS)' ;; \
! 	esac; \
! 	rev=''; for subdir in $$list; do \
! 	  if test "$$subdir" = "."; then :; else \
! 	    rev="$$subdir $$rev"; \
! 	  fi; \
  	done; \
! 	rev="$$rev ."; \
  	target=`echo $@ | sed s/-recursive//`; \
  	for subdir in $$rev; do \
--- 173,183 ----
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
! 	@set fnord $(MAKEFLAGS); amf=$$2; \
  	dot_seen=no; \
! 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" != "." || dot_seen=yes; \
  	done; \
! 	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
  	for subdir in $$rev; do \
***************
*** 205,425 ****
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  	done
- ctags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
- ETAGS = etags
- ETAGSFLAGS =
- 
- CTAGS = ctags
- CTAGSFLAGS =
  
  tags: TAGS
  
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	mkid -fID $$unique
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
- 	if (etags --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
- 	else \
- 	  include_option=--include; \
- 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test -f $$subdir/TAGS && \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
! 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	     $$tags $$unique
  
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
  
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! 
! top_distdir = .
! distdir = $(PACKAGE)-$(VERSION)
  
! am__remove_distdir = \
!   { test ! -d $(distdir) \
!     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
!          && rm -fr $(distdir); }; }
  
! GZIP_ENV = --best
! distuninstallcheck_listfiles = find . -type f -print
! distcleancheck_listfiles = find . -type f -print
  
  distdir: $(DISTFILES)
! 	$(am__remove_distdir)
  	mkdir $(distdir)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkinstalldirs) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
  	    || exit 1; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$(top_distdir)" \
! 	        distdir=../$(distdir)/$$subdir \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
! 	$(MAKE) $(AM_MAKEFLAGS) \
! 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
! 	  dist-hook
! 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! 	|| chmod -R a+r $(distdir)
! dist-gzip: distdir
! 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! 	$(am__remove_distdir)
! 
! dist dist-all: distdir
! 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! 	$(am__remove_distdir)
! 
! # This target untars the dist file and tries a VPATH configuration.  Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! 	$(am__remove_distdir)
! 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! 	chmod -R a-w $(distdir); chmod a+w $(distdir)
! 	mkdir $(distdir)/_build
! 	mkdir $(distdir)/_inst
! 	chmod a-w $(distdir)
! 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
! 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! 	  && cd $(distdir)/_build \
! 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
! 	    $(DISTCHECK_CONFIGURE_FLAGS) \
! 	  && $(MAKE) $(AM_MAKEFLAGS) \
! 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
! 	  && $(MAKE) $(AM_MAKEFLAGS) check \
! 	  && $(MAKE) $(AM_MAKEFLAGS) install \
! 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
! 	        distuninstallcheck \
! 	  && chmod -R a-w "$$dc_install_base" \
! 	  && ({ \
! 	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
! 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
! 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
! 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
! 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
! 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
! 	  && rm -rf "$$dc_destdir" \
! 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! 	  && rm -f $(distdir).tar.gz \
! 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! 	$(am__remove_distdir)
! 	@echo "$(distdir).tar.gz is ready for distribution" | \
! 	  sed 'h;s/./=/g;p;x;p;x'
! distuninstallcheck:
! 	@cd $(distuninstallcheck_dir) \
! 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
! 	   || { echo "ERROR: files left after uninstall:" ; \
! 	        if test -n "$(DESTDIR)"; then \
! 	          echo "  (check DESTDIR support)"; \
! 	        fi ; \
! 	        $(distuninstallcheck_listfiles) ; \
! 	        exit 1; } >&2
! distcleancheck: distclean
! 	@if test '$(srcdir)' = . ; then \
! 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! 	  exit 1 ; \
! 	fi
! 	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! 	  || { echo "ERROR: files left in build directory after distclean:" ; \
! 	       $(distcleancheck_listfiles) ; \
! 	       exit 1; } >&2
  check-am: all-am
  check: check-recursive
! all-am: Makefile
! installdirs: installdirs-recursive
! installdirs-am:
  
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
- uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! 
! installcheck: installcheck-recursive
  install-strip:
! 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
! 	  `test -z '$(STRIP)' || \
! 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
--- 195,327 ----
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  	done
  
  tags: TAGS
  
! ID: $(HEADERS) $(SOURCES) $(LISP)
! 	list='$(SOURCES) $(HEADERS)'; \
! 	unique=`for i in $$list; do echo $$i; done | \
! 	  awk '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	here=`pwd` && cd $(srcdir) \
! 	  && mkid -f$$here/ID $$unique $(LISP)
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $@)].in $(TAGS_DEPENDENCIES) $(LISP)
  	tags=; \
  	here=`pwd`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
!    if test "$$subdir" = .; then :; else \
! 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
!    fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)'; \
! 	unique=`for i in $$list; do echo $$i; done | \
! 	  awk '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$@)].in$$unique$(LISP)$$tags" \
! 	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $@)].in $$unique $(LISP))
  
! mostlyclean-tags:
  
! clean-tags:
  
  distclean-tags:
! 	-rm -f TAGS ID
  
! maintainer-clean-tags:
  
! distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
  
+ # This target untars the dist file and tries a VPATH configuration.  Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+ 	-rm -rf $(distdir)
+ 	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+ 	mkdir $(distdir)/=build
+ 	mkdir $(distdir)/=inst
+ 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+ 	cd $(distdir)/=build \
+ 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) check \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) install \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dist
+ 	-rm -rf $(distdir)
+ 	@banner="$(distdir).tar.gz is ready for distribution"; \
+ 	dashes=`echo "$$banner" | sed s/./=/g`; \
+ 	echo "$$dashes"; \
+ 	echo "$$banner"; \
+ 	echo "$$dashes"
+ dist: distdir
+ 	-chmod -R a+r $(distdir)
+ 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ 	-rm -rf $(distdir)
+ dist-all: distdir
+ 	-chmod -R a+r $(distdir)
+ 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ 	-rm -rf $(distdir)
  distdir: $(DISTFILES)
! 	-rm -rf $(distdir)
  	mkdir $(distdir)
! 	-chmod 777 $(distdir)
! 	here=`cd $(top_builddir) && pwd`; \
! 	top_distdir=`cd $(distdir) && pwd`; \
! 	distdir=`cd $(distdir) && pwd`; \
! 	cd $(top_srcdir) \
! 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! 	@for file in $(DISTFILES); do \
! 	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
  	  fi; \
  	done
! 	for subdir in $(SUBDIRS); do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
  	    || exit 1; \
! 	    chmod 777 $(distdir)/$$subdir; \
! 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
  	      || exit 1; \
  	  fi; \
  	done
! 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
  check-am: all-am
  check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! all-recursive-am: $@)]
! 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
! install-exec-am:
  install-exec: install-exec-recursive
+ 
+ install-data-am: install-data-local
  install-data: install-data-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am: uninstall-local
! uninstall: uninstall-recursive
! all-am: Makefile $@)]
! all-redirect: all-recursive-am
  install-strip:
! 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
! 
! 
  mostlyclean-generic:
  
***************
*** 427,501 ****
  
  distclean-generic:
! 	-rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! 
! clean-am: clean-generic mostlyclean-am
! 
! distclean: distclean-recursive
! 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-generic distclean-tags
! 
! dvi: dvi-recursive
! 
! dvi-am:
! 
! info: info-recursive
! 
! info-am:
! 
! install-data-am: install-data-local
! 
! install-exec-am:
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
! 
! maintainer-clean: maintainer-clean-recursive
! 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! 	-rm -rf $(top_srcdir)/autom4te.cache
! 	-rm -f Makefile
! maintainer-clean-am: distclean-am maintainer-clean-generic
  
  mostlyclean: mostlyclean-recursive
  
! mostlyclean-am: mostlyclean-generic
! 
! pdf: pdf-recursive
  
! pdf-am:
  
! ps: ps-recursive
  
! ps-am:
  
! uninstall-am: uninstall-info-am uninstall-local
  
! uninstall-info: uninstall-info-recursive
  
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
! 	clean-generic clean-recursive ctags ctags-recursive dist \
! 	dist-all dist-gzip distcheck distclean distclean-generic \
! 	distclean-recursive distclean-tags distcleancheck distdir \
! 	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
! 	info-recursive install install-am install-data install-data-am \
! 	install-data-local install-data-recursive install-exec \
! 	install-exec-am install-exec-recursive install-info \
! 	install-info-am install-info-recursive install-man \
! 	install-recursive install-strip installcheck installcheck-am \
! 	installdirs installdirs-am installdirs-recursive \
! 	maintainer-clean maintainer-clean-generic \
! 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
! 	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
! 	ps-recursive tags tags-recursive uninstall uninstall-am \
! 	uninstall-info-am uninstall-info-recursive uninstall-local \
! 	uninstall-recursive
  
  
--- 329,370 ----
  
  distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
! 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
  
  maintainer-clean-generic:
! mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
  
  mostlyclean: mostlyclean-recursive
  
! clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
  
! clean: clean-recursive
  
! distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
  
! distclean: distclean-recursive
! 	-rm -f config.status
  
! maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
! 		maintainer-clean-generic distclean-am
! 	@echo "This command is intended for maintainers to use;"
! 	@echo "it deletes files that may require special tools to rebuild."
  
! maintainer-clean: maintainer-clean-recursive
! 	-rm -f config.status
  
! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
! install-exec-am install-exec install-data-local install-data-am \
! install-data install-am install uninstall-local uninstall-am uninstall \
! all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
  
  
***************
*** 509,512 ****
--- 378,382 ----
  dist-hook:
  	rm -rf `find $(distdir)/{lib,doc,src} -name CVS`
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.