1.1 --- a/src/md5/Makefile.in	Fri May 07 16:42:58 2010 +0200
     1.2 +++ b/src/md5/Makefile.in	Fri May 07 16:44:26 2010 +0200
     1.3 @@ -1,8 +1,9 @@
     1.4 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
     1.5 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
     1.6  # @configure_input@
     1.7  
     1.8 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
     1.9 -# Free Software Foundation, Inc.
    1.10 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    1.11 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
    1.12 +# Inc.
    1.13  # This Makefile.in is free software; the Free Software Foundation
    1.14  # gives unlimited permission to copy and/or distribute it,
    1.15  # with or without modifications, as long as this notice is preserved.
    1.16 @@ -14,16 +15,13 @@
    1.17  
    1.18  @SET_MAKE@
    1.19  
    1.20 -srcdir = @srcdir@
    1.21 -top_srcdir = @top_srcdir@
    1.22 +
    1.23  VPATH = @srcdir@
    1.24  pkgdatadir = $(datadir)/@PACKAGE@
    1.25 +pkgincludedir = $(includedir)/@PACKAGE@
    1.26  pkglibdir = $(libdir)/@PACKAGE@
    1.27 -pkgincludedir = $(includedir)/@PACKAGE@
    1.28 -top_builddir = ../..
    1.29 -
    1.30 +pkglibexecdir = $(libexecdir)/@PACKAGE@
    1.31  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    1.32 -INSTALL = @INSTALL@
    1.33  install_sh_DATA = $(install_sh) -c -m 644
    1.34  install_sh_PROGRAM = $(install_sh) -c
    1.35  install_sh_SCRIPT = $(install_sh) -c
    1.36 @@ -35,9 +33,43 @@
    1.37  NORMAL_UNINSTALL = :
    1.38  PRE_UNINSTALL = :
    1.39  POST_UNINSTALL = :
    1.40 +noinst_PROGRAMS = hmactest$(EXEEXT)
    1.41 +subdir = src/md5
    1.42 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    1.43 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    1.44 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    1.45 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    1.46 +	$(ACLOCAL_M4)
    1.47 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    1.48 +CONFIG_HEADER = $(top_builddir)/config.h
    1.49 +CONFIG_CLEAN_FILES =
    1.50 +CONFIG_CLEAN_VPATH_FILES =
    1.51 +LIBRARIES = $(noinst_LIBRARIES)
    1.52 +AR = ar
    1.53 +ARFLAGS = cru
    1.54 +libmd5c_a_AR = $(AR) $(ARFLAGS)
    1.55 +libmd5c_a_LIBADD =
    1.56 +am_libmd5c_a_OBJECTS = md5c.$(OBJEXT) hmac_md5.$(OBJEXT)
    1.57 +libmd5c_a_OBJECTS = $(am_libmd5c_a_OBJECTS)
    1.58 +PROGRAMS = $(noinst_PROGRAMS)
    1.59 +am_hmactest_OBJECTS = md5c.$(OBJEXT) hmac_md5.$(OBJEXT) \
    1.60 +	hmactest.$(OBJEXT)
    1.61 +hmactest_OBJECTS = $(am_hmactest_OBJECTS)
    1.62 +hmactest_LDADD = $(LDADD)
    1.63 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
    1.64 +depcomp = $(SHELL) $(top_srcdir)/depcomp
    1.65 +am__depfiles_maybe = depfiles
    1.66 +am__mv = mv -f
    1.67 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    1.68 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    1.69 +CCLD = $(CC)
    1.70 +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    1.71 +SOURCES = $(libmd5c_a_SOURCES) $(hmactest_SOURCES)
    1.72 +DIST_SOURCES = $(libmd5c_a_SOURCES) $(hmactest_SOURCES)
    1.73 +ETAGS = etags
    1.74 +CTAGS = ctags
    1.75 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    1.76  ACLOCAL = @ACLOCAL@
    1.77 -AMDEP_FALSE = @AMDEP_FALSE@
    1.78 -AMDEP_TRUE = @AMDEP_TRUE@
    1.79  AMTAR = @AMTAR@
    1.80  AUTOCONF = @AUTOCONF@
    1.81  AUTOHEADER = @AUTOHEADER@
    1.82 @@ -61,6 +93,7 @@
    1.83  GLIB_LIBS = @GLIB_LIBS@
    1.84  GREP = @GREP@
    1.85  IDENT_LIBS = @IDENT_LIBS@
    1.86 +INSTALL = @INSTALL@
    1.87  INSTALL_DATA = @INSTALL_DATA@
    1.88  INSTALL_PROGRAM = @INSTALL_PROGRAM@
    1.89  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    1.90 @@ -72,12 +105,14 @@
    1.91  LTLIBOBJS = @LTLIBOBJS@
    1.92  MAKEINFO = @MAKEINFO@
    1.93  MD5_LIBS = @MD5_LIBS@
    1.94 +MKDIR_P = @MKDIR_P@
    1.95  OBJEXT = @OBJEXT@
    1.96  PACKAGE = @PACKAGE@
    1.97  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    1.98  PACKAGE_NAME = @PACKAGE_NAME@
    1.99  PACKAGE_STRING = @PACKAGE_STRING@
   1.100  PACKAGE_TARNAME = @PACKAGE_TARNAME@
   1.101 +PACKAGE_URL = @PACKAGE_URL@
   1.102  PACKAGE_VERSION = @PACKAGE_VERSION@
   1.103  PATH_SEPARATOR = @PATH_SEPARATOR@
   1.104  PKG_CONFIG = @PKG_CONFIG@
   1.105 @@ -88,14 +123,19 @@
   1.106  STRIP = @STRIP@
   1.107  USE_LIBLOCKFILE = @USE_LIBLOCKFILE@
   1.108  VERSION = @VERSION@
   1.109 +abs_builddir = @abs_builddir@
   1.110 +abs_srcdir = @abs_srcdir@
   1.111 +abs_top_builddir = @abs_top_builddir@
   1.112 +abs_top_srcdir = @abs_top_srcdir@
   1.113  ac_ct_CC = @ac_ct_CC@
   1.114 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
   1.115 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
   1.116  am__include = @am__include@
   1.117  am__leading_dot = @am__leading_dot@
   1.118  am__quote = @am__quote@
   1.119 +am__tar = @am__tar@
   1.120 +am__untar = @am__untar@
   1.121  bindir = @bindir@
   1.122  build_alias = @build_alias@
   1.123 +builddir = @builddir@
   1.124  datadir = @datadir@
   1.125  datarootdir = @datarootdir@
   1.126  docdir = @docdir@
   1.127 @@ -112,6 +152,7 @@
   1.128  localedir = @localedir@
   1.129  localstatedir = @localstatedir@
   1.130  mandir = @mandir@
   1.131 +mkdir_p = @mkdir_p@
   1.132  oldincludedir = @oldincludedir@
   1.133  pdfdir = @pdfdir@
   1.134  prefix = @prefix@
   1.135 @@ -119,18 +160,19 @@
   1.136  psdir = @psdir@
   1.137  sbindir = @sbindir@
   1.138  sharedstatedir = @sharedstatedir@
   1.139 +srcdir = @srcdir@
   1.140  sysconfdir = @sysconfdir@
   1.141  target_alias = @target_alias@
   1.142 +top_build_prefix = @top_build_prefix@
   1.143 +top_builddir = @top_builddir@
   1.144 +top_srcdir = @top_srcdir@
   1.145  with_confdir = @with_confdir@
   1.146  with_group = @with_group@
   1.147  with_logdir = @with_logdir@
   1.148  with_spooldir = @with_spooldir@
   1.149  with_user = @with_user@
   1.150  AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -D_GNU_SOURCE
   1.151 -
   1.152  noinst_LIBRARIES = libmd5c.a
   1.153 -noinst_PROGRAMS = hmactest
   1.154 -
   1.155  hmactest_SOURCES = \
   1.156  	md5.h\
   1.157  	global.h\
   1.158 @@ -139,7 +181,6 @@
   1.159  	hmac_md5.c\
   1.160  	hmactest.c
   1.161  
   1.162 -
   1.163  libmd5c_a_SOURCES = \
   1.164  	md5.h\
   1.165  	global.h\
   1.166 @@ -147,51 +188,40 @@
   1.167  	hmac_md5.h\
   1.168  	hmac_md5.c
   1.169  
   1.170 -subdir = src/md5
   1.171 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
   1.172 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
   1.173 -CONFIG_HEADER = $(top_builddir)/config.h
   1.174 -CONFIG_CLEAN_FILES =
   1.175 -LIBRARIES = $(noinst_LIBRARIES)
   1.176 -
   1.177 -libmd5c_a_AR = $(AR) cru
   1.178 -libmd5c_a_LIBADD =
   1.179 -am_libmd5c_a_OBJECTS = md5c.$(OBJEXT) hmac_md5.$(OBJEXT)
   1.180 -libmd5c_a_OBJECTS = $(am_libmd5c_a_OBJECTS)
   1.181 -noinst_PROGRAMS = hmactest$(EXEEXT)
   1.182 -PROGRAMS = $(noinst_PROGRAMS)
   1.183 -
   1.184 -am_hmactest_OBJECTS = md5c.$(OBJEXT) hmac_md5.$(OBJEXT) \
   1.185 -	hmactest.$(OBJEXT)
   1.186 -hmactest_OBJECTS = $(am_hmactest_OBJECTS)
   1.187 -hmactest_LDADD = $(LDADD)
   1.188 -hmactest_DEPENDENCIES =
   1.189 -hmactest_LDFLAGS =
   1.190 -
   1.191 -DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
   1.192 -depcomp = $(SHELL) $(top_srcdir)/depcomp
   1.193 -am__depfiles_maybe = depfiles
   1.194 -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/hmac_md5.Po ./$(DEPDIR)/hmactest.Po \
   1.195 -@AMDEP_TRUE@	./$(DEPDIR)/md5c.Po
   1.196 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
   1.197 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
   1.198 -CCLD = $(CC)
   1.199 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
   1.200 -DIST_SOURCES = $(libmd5c_a_SOURCES) $(hmactest_SOURCES)
   1.201 -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
   1.202 -SOURCES = $(libmd5c_a_SOURCES) $(hmactest_SOURCES)
   1.203 -
   1.204  all: all-am
   1.205  
   1.206  .SUFFIXES:
   1.207  .SUFFIXES: .c .o .obj
   1.208 -$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
   1.209 -	cd $(top_srcdir) && \
   1.210 -	  $(AUTOMAKE) --gnu  src/md5/Makefile
   1.211 -Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
   1.212 -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
   1.213 +$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
   1.214 +	@for dep in $?; do \
   1.215 +	  case '$(am__configure_deps)' in \
   1.216 +	    *$$dep*) \
   1.217 +	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
   1.218 +	        && { if test -f $@; then exit 0; else break; fi; }; \
   1.219 +	      exit 1;; \
   1.220 +	  esac; \
   1.221 +	done; \
   1.222 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/md5/Makefile'; \
   1.223 +	$(am__cd) $(top_srcdir) && \
   1.224 +	  $(AUTOMAKE) --gnu src/md5/Makefile
   1.225 +.PRECIOUS: Makefile
   1.226 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   1.227 +	@case '$?' in \
   1.228 +	  *config.status*) \
   1.229 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
   1.230 +	  *) \
   1.231 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
   1.232 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
   1.233 +	esac;
   1.234  
   1.235 -AR = ar
   1.236 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   1.237 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   1.238 +
   1.239 +$(top_srcdir)/configure:  $(am__configure_deps)
   1.240 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   1.241 +$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
   1.242 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   1.243 +$(am__aclocal_m4_deps):
   1.244  
   1.245  clean-noinstLIBRARIES:
   1.246  	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
   1.247 @@ -204,10 +234,10 @@
   1.248  	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
   1.249  hmactest$(EXEEXT): $(hmactest_OBJECTS) $(hmactest_DEPENDENCIES) 
   1.250  	@rm -f hmactest$(EXEEXT)
   1.251 -	$(LINK) $(hmactest_LDFLAGS) $(hmactest_OBJECTS) $(hmactest_LDADD) $(LIBS)
   1.252 +	$(LINK) $(hmactest_OBJECTS) $(hmactest_LDADD) $(LIBS)
   1.253  
   1.254  mostlyclean-compile:
   1.255 -	-rm -f *.$(OBJEXT) core *.core
   1.256 +	-rm -f *.$(OBJEXT)
   1.257  
   1.258  distclean-compile:
   1.259  	-rm -f *.tab.c
   1.260 @@ -217,117 +247,104 @@
   1.261  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5c.Po@am__quote@
   1.262  
   1.263  .c.o:
   1.264 -@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
   1.265 -@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
   1.266 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
   1.267 -@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
   1.268 -@am__fastdepCC_TRUE@	fi
   1.269 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   1.270 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.271  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.272 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
   1.273 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.274 -@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
   1.275 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.276 +@am__fastdepCC_FALSE@	$(COMPILE) -c $<
   1.277  
   1.278  .c.obj:
   1.279 -@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
   1.280 -@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
   1.281 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
   1.282 -@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
   1.283 -@am__fastdepCC_TRUE@	fi
   1.284 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
   1.285 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.286  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.287 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
   1.288 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.289 -@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
   1.290 -uninstall-info-am:
   1.291 -
   1.292 -ETAGS = etags
   1.293 -ETAGSFLAGS =
   1.294 -
   1.295 -CTAGS = ctags
   1.296 -CTAGSFLAGS =
   1.297 -
   1.298 -tags: TAGS
   1.299 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.300 +@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
   1.301  
   1.302  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
   1.303  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
   1.304  	unique=`for i in $$list; do \
   1.305  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.306  	  done | \
   1.307 -	  $(AWK) '    { files[$$0] = 1; } \
   1.308 -	       END { for (i in files) print i; }'`; \
   1.309 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.310 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.311  	mkid -fID $$unique
   1.312 +tags: TAGS
   1.313  
   1.314  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   1.315  		$(TAGS_FILES) $(LISP)
   1.316 -	tags=; \
   1.317 +	set x; \
   1.318  	here=`pwd`; \
   1.319  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
   1.320  	unique=`for i in $$list; do \
   1.321  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.322  	  done | \
   1.323 -	  $(AWK) '    { files[$$0] = 1; } \
   1.324 -	       END { for (i in files) print i; }'`; \
   1.325 -	test -z "$(ETAGS_ARGS)$$tags$$unique" \
   1.326 -	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.327 -	     $$tags $$unique
   1.328 -
   1.329 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.330 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.331 +	shift; \
   1.332 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
   1.333 +	  test -n "$$unique" || unique=$$empty_fix; \
   1.334 +	  if test $$# -gt 0; then \
   1.335 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.336 +	      "$$@" $$unique; \
   1.337 +	  else \
   1.338 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.339 +	      $$unique; \
   1.340 +	  fi; \
   1.341 +	fi
   1.342  ctags: CTAGS
   1.343  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   1.344  		$(TAGS_FILES) $(LISP)
   1.345 -	tags=; \
   1.346 -	here=`pwd`; \
   1.347  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
   1.348  	unique=`for i in $$list; do \
   1.349  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.350  	  done | \
   1.351 -	  $(AWK) '    { files[$$0] = 1; } \
   1.352 -	       END { for (i in files) print i; }'`; \
   1.353 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
   1.354 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.355 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.356 +	test -z "$(CTAGS_ARGS)$$unique" \
   1.357  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
   1.358 -	     $$tags $$unique
   1.359 +	     $$unique
   1.360  
   1.361  GTAGS:
   1.362  	here=`$(am__cd) $(top_builddir) && pwd` \
   1.363 -	  && cd $(top_srcdir) \
   1.364 -	  && gtags -i $(GTAGS_ARGS) $$here
   1.365 +	  && $(am__cd) $(top_srcdir) \
   1.366 +	  && gtags -i $(GTAGS_ARGS) "$$here"
   1.367  
   1.368  distclean-tags:
   1.369  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   1.370 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   1.371 -
   1.372 -top_distdir = ../..
   1.373 -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
   1.374  
   1.375  distdir: $(DISTFILES)
   1.376 -	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
   1.377 -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
   1.378 -	list='$(DISTFILES)'; for file in $$list; do \
   1.379 -	  case $$file in \
   1.380 -	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
   1.381 -	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
   1.382 -	  esac; \
   1.383 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   1.384 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   1.385 +	list='$(DISTFILES)'; \
   1.386 +	  dist_files=`for file in $$list; do echo $$file; done | \
   1.387 +	  sed -e "s|^$$srcdirstrip/||;t" \
   1.388 +	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
   1.389 +	case $$dist_files in \
   1.390 +	  */*) $(MKDIR_P) `echo "$$dist_files" | \
   1.391 +			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
   1.392 +			   sort -u` ;; \
   1.393 +	esac; \
   1.394 +	for file in $$dist_files; do \
   1.395  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   1.396 -	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
   1.397 -	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
   1.398 -	    dir="/$$dir"; \
   1.399 -	    $(mkinstalldirs) "$(distdir)$$dir"; \
   1.400 +	  if test -d $$d/$$file; then \
   1.401 +	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   1.402 +	    if test -d "$(distdir)/$$file"; then \
   1.403 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   1.404 +	    fi; \
   1.405 +	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   1.406 +	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   1.407 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   1.408 +	    fi; \
   1.409 +	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   1.410  	  else \
   1.411 -	    dir=''; \
   1.412 -	  fi; \
   1.413 -	  if test -d $$d/$$file; then \
   1.414 -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   1.415 -	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
   1.416 -	    fi; \
   1.417 -	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
   1.418 -	  else \
   1.419 -	    test -f $(distdir)/$$file \
   1.420 -	    || cp -p $$d/$$file $(distdir)/$$file \
   1.421 +	    test -f "$(distdir)/$$file" \
   1.422 +	    || cp -p $$d/$$file "$(distdir)/$$file" \
   1.423  	    || exit 1; \
   1.424  	  fi; \
   1.425  	done
   1.426  check-am: all-am
   1.427  check: check-am
   1.428  all-am: Makefile $(LIBRARIES) $(PROGRAMS)
   1.429 -
   1.430  installdirs:
   1.431  install: install-am
   1.432  install-exec: install-exec-am
   1.433 @@ -348,7 +365,8 @@
   1.434  clean-generic:
   1.435  
   1.436  distclean-generic:
   1.437 -	-rm -f $(CONFIG_CLEAN_FILES)
   1.438 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   1.439 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   1.440  
   1.441  maintainer-clean-generic:
   1.442  	@echo "This command is intended for maintainers to use"
   1.443 @@ -368,18 +386,40 @@
   1.444  
   1.445  dvi-am:
   1.446  
   1.447 +html: html-am
   1.448 +
   1.449 +html-am:
   1.450 +
   1.451  info: info-am
   1.452  
   1.453  info-am:
   1.454  
   1.455  install-data-am:
   1.456  
   1.457 +install-dvi: install-dvi-am
   1.458 +
   1.459 +install-dvi-am:
   1.460 +
   1.461  install-exec-am:
   1.462  
   1.463 +install-html: install-html-am
   1.464 +
   1.465 +install-html-am:
   1.466 +
   1.467  install-info: install-info-am
   1.468  
   1.469 +install-info-am:
   1.470 +
   1.471  install-man:
   1.472  
   1.473 +install-pdf: install-pdf-am
   1.474 +
   1.475 +install-pdf-am:
   1.476 +
   1.477 +install-ps: install-ps-am
   1.478 +
   1.479 +install-ps-am:
   1.480 +
   1.481  installcheck-am:
   1.482  
   1.483  maintainer-clean: maintainer-clean-am
   1.484 @@ -399,18 +439,23 @@
   1.485  
   1.486  ps-am:
   1.487  
   1.488 -uninstall-am: uninstall-info-am
   1.489 +uninstall-am:
   1.490 +
   1.491 +.MAKE: install-am install-strip
   1.492  
   1.493  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
   1.494  	clean-noinstLIBRARIES clean-noinstPROGRAMS ctags distclean \
   1.495  	distclean-compile distclean-generic distclean-tags distdir dvi \
   1.496 -	dvi-am info info-am install install-am install-data \
   1.497 -	install-data-am install-exec install-exec-am install-info \
   1.498 -	install-info-am install-man install-strip installcheck \
   1.499 -	installcheck-am installdirs maintainer-clean \
   1.500 +	dvi-am html html-am info info-am install install-am \
   1.501 +	install-data install-data-am install-dvi install-dvi-am \
   1.502 +	install-exec install-exec-am install-html install-html-am \
   1.503 +	install-info install-info-am install-man install-pdf \
   1.504 +	install-pdf-am install-ps install-ps-am install-strip \
   1.505 +	installcheck installcheck-am installdirs maintainer-clean \
   1.506  	maintainer-clean-generic mostlyclean mostlyclean-compile \
   1.507  	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
   1.508 -	uninstall-am uninstall-info-am
   1.509 +	uninstall-am
   1.510 +
   1.511  
   1.512  # Tell versions [3.59,3.63) of GNU make to not export all variables.
   1.513  # Otherwise a system limit (for SysV at least) may be exceeded.