Imported Upstream version 1.8.0upstream/1.8.0

6 files changed, 0 insertions, 1587 deletions

diff --git a/tiff/contrib/iptcutil/Makefile.am b/tiff/contrib/iptcutil/Makefile.am
deleted file mode 100644
index 9b94ed7..0000000
--- a/tiff/contrib/iptcutil/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-# Tag Image File Format (TIFF) Software
-#
-# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-
-# Process this file with automake to produce Makefile.in.
-
-LIBTIFF = $(top_builddir)/libtiff/libtiff.la
-
-EXTRA_DIST = README test.iptc test.txt
-
-noinst_PROGRAMS = iptcutil
-
-iptcutil_SOURCES = iptcutil.c
-iptcutil_LDADD = $(LIBTIFF)
-
-INCLUDES = -I$(top_srcdir)/libtiff
-
diff --git a/tiff/contrib/iptcutil/Makefile.in b/tiff/contrib/iptcutil/Makefile.in
deleted file mode 100644
index 6207a44..0000000
--- a/tiff/contrib/iptcutil/Makefile.in
+++ /dev/null
@@ -1,553 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Tag Image File Format (TIFF) Software
-#
-# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-
-# Process this file with automake to produce Makefile.in.
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-noinst_PROGRAMS = iptcutil$(EXEEXT)
-subdir = contrib/iptcutil
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/libtiff/tif_config.h \
-	$(top_builddir)/libtiff/tiffconf.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_iptcutil_OBJECTS = iptcutil.$(OBJEXT)
-iptcutil_OBJECTS = $(am_iptcutil_OBJECTS)
-iptcutil_DEPENDENCIES = $(LIBTIFF)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/libtiff
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(iptcutil_SOURCES)
-DIST_SOURCES = $(iptcutil_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-GLU_CFLAGS = @GLU_CFLAGS@
-GLU_LIBS = @GLU_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBDIR = @LIBDIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
-LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
-LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
-LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
-LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
-LIBTIFF_RELEASE_DATE = @LIBTIFF_RELEASE_DATE@
-LIBTIFF_VERSION = @LIBTIFF_VERSION@
-LIBTIFF_VERSION_INFO = @LIBTIFF_VERSION_INFO@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-LIBTIFF = $(top_builddir)/libtiff/libtiff.la
-EXTRA_DIST = README test.iptc test.txt
-iptcutil_SOURCES = iptcutil.c
-iptcutil_LDADD = $(LIBTIFF)
-INCLUDES = -I$(top_srcdir)/libtiff
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/iptcutil/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign contrib/iptcutil/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-iptcutil$(EXEEXT): $(iptcutil_OBJECTS) $(iptcutil_DEPENDENCIES) 
-	@rm -f iptcutil$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(iptcutil_OBJECTS) $(iptcutil_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iptcutil.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-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:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-# 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.
-.NOEXPORT:
diff --git a/tiff/contrib/iptcutil/README b/tiff/contrib/iptcutil/README
deleted file mode 100644
index 1619ef4..0000000
--- a/tiff/contrib/iptcutil/README
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Program: IPTCUTIL.C
-
-Purpose: Convert between IPTC binary and a "special" IPTC text file format.
-
-Usage:   iptcutil -t | -b [-i file] [-o file] <input >output
-
-Notes:   You tell the program the "type" of input file via the -t and -b
-         switches. The -t says that the input is text, while the -b says
-         that the input is binary IPTC. You can use either the -i or the
-         -o switches to tell the program what the input and output files
-         will be, or use simple piping.
-
-Author:  William T. Radcliffe (billr@corbis.com)
-         Parts of this program were derived from other places. The original
-         binary to text conversion was taken from the PHP distribution and
-         the tokenizer was written many years ago, by someone else as well.
-
-This software is provided freely "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 William T. Radcliffe 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 IPTCUTIL
-
diff --git a/tiff/contrib/iptcutil/iptcutil.c b/tiff/contrib/iptcutil/iptcutil.c
deleted file mode 100644
index 557a67e..0000000
--- a/tiff/contrib/iptcutil/iptcutil.c
+++ /dev/null
@@ -1,941 +0,0 @@
-/* $Id: iptcutil.c,v 1.4.2.2 2010-06-08 18:50:41 bfriesen Exp $ */
-
-#include "tif_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <memory.h>
-#include <ctype.h>
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#ifdef WIN32
-#define STRNICMP strnicmp
-#else 
-#define STRNICMP strncasecmp
-#endif 
-
-typedef struct _tag_spec
-{
-  short
-    id;
-
-  char
-    *name;
-} tag_spec;
-
-static tag_spec tags[] = {
-    { 5,"Image Name" },
-    { 7,"Edit Status" },
-    { 10,"Priority" },
-    { 15,"Category" },
-    { 20,"Supplemental Category" },
-    { 22,"Fixture Identifier" },
-    { 25,"Keyword" },
-    { 30,"Release Date" },
-    { 35,"Release Time" },
-    { 40,"Special Instructions" },
-    { 45,"Reference Service" },
-    { 47,"Reference Date" },
-    { 50,"Reference Number" },
-    { 55,"Created Date" },
-    { 60,"Created Time" },
-    { 65,"Originating Program" },
-    { 70,"Program Version" },
-    { 75,"Object Cycle" },
-    { 80,"Byline" },
-    { 85,"Byline Title" },
-    { 90,"City" },
-    { 95,"Province State" },
-    { 100,"Country Code" },
-    { 101,"Country" },
-    { 103,"Original Transmission Reference" },
-    { 105,"Headline" },
-    { 110,"Credit" },
-    { 115,"Source" },
-    { 116,"Copyright String" },
-    { 120,"Caption" },
-    { 121,"Local Caption" },
-    { 122,"Caption Writer" },
-    { 200,"Custom Field 1" },
-    { 201,"Custom Field 2" },
-    { 202,"Custom Field 3" },
-    { 203,"Custom Field 4" },
-    { 204,"Custom Field 5" },
-    { 205,"Custom Field 6" },
-    { 206,"Custom Field 7" },
-    { 207,"Custom Field 8" },
-    { 208,"Custom Field 9" },
-    { 209,"Custom Field 10" },
-    { 210,"Custom Field 11" },
-    { 211,"Custom Field 12" },
-    { 212,"Custom Field 13" },
-    { 213,"Custom Field 14" },
-    { 214,"Custom Field 15" },
-    { 215,"Custom Field 16" },
-    { 216,"Custom Field 17" },
-    { 217,"Custom Field 18" },
-    { 218,"Custom Field 19" },
-    { 219,"Custom Field 20" }
-};
-
-/*
- * We format the output using HTML conventions
- * to preserve control characters and such.
- */
-void formatString(FILE *ofile, const char *s, int len)
-{
-  putc('"', ofile);
-  for (; len > 0; --len, ++s) {
-    int c = *s;
-    switch (c) {
-    case '&':
-      fputs("&amp;", ofile);
-      break;
-#ifdef HANDLE_GT_LT
-    case '<':
-      fputs("&lt;", ofile);
-      break;
-    case '>':
-      fputs("&gt;", ofile);
-      break;
-#endif
-    case '"':
-      fputs("&quot;", ofile);
-      break;
-    default:
-      if (iscntrl(c))
-        fprintf(ofile, "&#%d;", c);
-      else
-        putc(*s, ofile);
-      break;
-    }
-  }
-  fputs("\"\n", ofile);
-}
-
-typedef struct _html_code
-{
-  short
-    len;
-  const char
-    *code,
-    val;
-} html_code;
-
-static html_code html_codes[] = {
-#ifdef HANDLE_GT_LT
-    { 4,"&lt;",'<' },
-    { 4,"&gt;",'>' },
-#endif
-    { 5,"&amp;",'&' },
-    { 6,"&quot;",'"' }
-};
-
-/*
- * This routine converts HTML escape sequence
- * back to the original ASCII representation.
- * - returns the number of characters dropped.
- */
-int convertHTMLcodes(char *s, int len)
-{
-  if (len <=0 || s==(char*)NULL || *s=='\0')
-    return 0;
-
-  if (s[1] == '#')
-    {
-      int val, o;
-
-      if (sscanf(s,"&#%d;",&val) == 1)
-      {
-        o = 3;
-        while (s[o] != ';')
-        {
-          o++;
-          if (o > 5)
-            break;
-        }
-        if (o < 5)
-          strcpy(s+1, s+1+o);
-        *s = val;
-        return o;
-      }
-    }
-  else
-    {
-      int
-        i,
-        codes = sizeof(html_codes) / sizeof(html_code);
-
-      for (i=0; i < codes; i++)
-      {
-        if (html_codes[i].len <= len)
-          if (STRNICMP(s, html_codes[i].code, html_codes[i].len) == 0)
-            {
-              strcpy(s+1, s+html_codes[i].len);
-              *s = html_codes[i].val;
-              return html_codes[i].len-1;
-            }
-      }
-    }
-
-  return 0;
-}
-
-int formatIPTC(FILE *ifile, FILE *ofile)
-{
-  unsigned int
-    foundiptc,
-    tagsfound;
-
-  unsigned char
-    recnum,
-    dataset;
-
-  char
-    *readable,
-    *str;
-
-  long
-    tagindx,
-    taglen;
-
-  int
-    i,
-    tagcount = sizeof(tags) / sizeof(tag_spec);
-
-  char
-    c;
-
-  foundiptc = 0; /* found the IPTC-Header */
-  tagsfound = 0; /* number of tags found */
-
-  c = getc(ifile);
-  while (c != EOF)
-  {
-	  if (c == 0x1c)
-	    foundiptc = 1;
-	  else
-      {
-        if (foundiptc)
-	        return -1;
-        else
-	        continue;
-	    }
-
-    /* we found the 0x1c tag and now grab the dataset and record number tags */
-    dataset = getc(ifile);
-	  if ((char) dataset == EOF)
-	    return -1;
-    recnum = getc(ifile);
-	  if ((char) recnum == EOF)
-	    return -1;
-    /* try to match this record to one of the ones in our named table */
-    for (i=0; i< tagcount; i++)
-    {
-      if (tags[i].id == recnum)
-          break;
-    }
-    if (i < tagcount)
-      readable = tags[i].name;
-    else
-      readable = "";
-
-    /* then we decode the length of the block that follows - long or short fmt */
-    c = getc(ifile);
-	  if (c == EOF)
-	    return 0;
-	  if (c & (unsigned char) 0x80)
-      {
-        unsigned char
-          buffer[4];
-
-        for (i=0; i<4; i++)
-        {
-          c = buffer[i] = getc(ifile);
-          if (c == EOF)
-            return -1;
-        }
-        taglen = (((long) buffer[ 0 ]) << 24) |
-                 (((long) buffer[ 1 ]) << 16) | 
-	               (((long) buffer[ 2 ]) <<  8) |
-                 (((long) buffer[ 3 ]));
-	    }
-    else
-      {
-        unsigned char
-          x = c;
-
-        taglen = ((long) x) << 8;
-        x = getc(ifile);
-        if ((char)x == EOF)
-          return -1;
-        taglen |= (long) x;
-	    }
-    /* make a buffer to hold the tag data and snag it from the input stream */
-    str = (char *) malloc((unsigned int) (taglen+1));
-    if (str == (char *) NULL)
-      {
-        printf("Memory allocation failed");
-        return 0;
-      }
-    for (tagindx=0; tagindx<taglen; tagindx++)
-    {
-      c = str[tagindx] = getc(ifile);
-      if (c == EOF)
-        return -1;
-    }
-    str[ taglen ] = 0;
-
-    /* now finish up by formatting this binary data into ASCII equivalent */
-    if (strlen(readable) > 0)
-	    fprintf(ofile, "%d#%d#%s=",(unsigned int)dataset, (unsigned int) recnum, readable);
-    else
-	    fprintf(ofile, "%d#%d=",(unsigned int)dataset, (unsigned int) recnum);
-    formatString( ofile, str, taglen );
-    free(str);
-
-	  tagsfound++;
-
-    c = getc(ifile);
-  }
-  return tagsfound;
-}
-
-int tokenizer(unsigned inflag,char *token,int tokmax,char *line,
-char *white,char *brkchar,char *quote,char eschar,char *brkused,
-int *next,char *quoted);
-
-char *super_fgets(char *b, int *blen, FILE *file)
-{
-  int
-    c,
-    len;
-
-  char
-    *q;
-
-  len=*blen;
-  for (q=b; ; q++)
-  {
-    c=fgetc(file);
-    if (c == EOF || c == '\n')
-      break;
-    if (((int)q - (int)b + 1 ) >= (int) len)
-      {
-        int
-          tlen;
-
-        tlen=(int)q-(int)b;
-        len<<=1;
-        b=(char *) realloc((char *) b,(len+2));
-        if ((char *) b == (char *) NULL)
-          break;
-        q=b+tlen;
-      }
-    *q=(unsigned char) c;
-  }
-  *blen=0;
-  if ((unsigned char *)b != (unsigned char *) NULL)
-    {
-      int
-        tlen;
-
-      tlen=(int)q - (int)b;
-      if (tlen == 0)
-        return (char *) NULL;
-      b[tlen] = '\0';
-      *blen=++tlen;
-    }
-  return b;
-}
-
-#define BUFFER_SZ 4096
-
-int main(int argc, char *argv[])
-{            
-  unsigned int
-    length;
-
-  unsigned char
-    *buffer;
-
-  int
-    i,
-    mode; /* iptc binary, or iptc text */
-
-  FILE
-    *ifile = stdin,
-    *ofile = stdout;
-
-  char
-    c,
-    *usage = "usage: iptcutil -t | -b [-i file] [-o file] <input >output";
-
-  if( argc < 2 )
-    {
-      printf("%s\n", usage);
-	    return 1;
-    }
-
-  mode = 0;
-  length = -1;
-  buffer = (unsigned char *)NULL;
-
-  for (i=1; i<argc; i++)
-  {
-    c = argv[i][0];
-    if (c == '-' || c == '/')
-      {
-        c = argv[i][1];
-        switch( c )
-        {
-        case 't':
-	        mode = 1;
-#ifdef WIN32
-          /* Set "stdout" to binary mode: */
-          _setmode( _fileno( ofile ), _O_BINARY );
-#endif
-	        break;
-        case 'b':
-	        mode = 0;
-#ifdef WIN32
-          /* Set "stdin" to binary mode: */
-          _setmode( _fileno( ifile ), _O_BINARY );
-#endif
-	        break;
-        case 'i':
-          if (mode == 0)
-            ifile = fopen(argv[++i], "rb");
-          else
-            ifile = fopen(argv[++i], "rt");
-          if (ifile == (FILE *)NULL)
-            {
-	            printf("Unable to open: %s\n", argv[i]);
-              return 1;
-            }
-	        break;
-        case 'o':
-          if (mode == 0)
-            ofile = fopen(argv[++i], "wt");
-          else
-            ofile = fopen(argv[++i], "wb");
-          if (ofile == (FILE *)NULL)
-            {
-	            printf("Unable to open: %s\n", argv[i]);
-              return 1;
-            }
-	        break;
-        default:
-	        printf("Unknown option: %s\n", argv[i]);
-	        return 1;
-        }
-      }
-    else
-      {
-        printf("%s\n", usage);
-	      return 1;
-      }
-  }
-
-  if (mode == 0) /* handle binary iptc info */
-    formatIPTC(ifile, ofile);
-
-  if (mode == 1) /* handle text form of iptc info */
-    {
-      char
-        brkused,
-        quoted,
-        *line,
-        *token,
-        *newstr;
-
-      int
-        state,
-        next;
-
-      unsigned char
-        recnum = 0,
-        dataset = 0;
-
-      int
-        inputlen = BUFFER_SZ;
-
-      line = (char *) malloc(inputlen);     
-      token = (char *)NULL;
-      while((line = super_fgets(line,&inputlen,ifile))!=NULL)
-      {
-        state=0;
-        next=0;
-
-        token = (char *) malloc(inputlen);     
-        newstr = (char *) malloc(inputlen);     
-        while(tokenizer(0, token, inputlen, line, "", "=", "\"", 0,
-          &brkused,&next,&quoted)==0)
-        {
-          if (state == 0)
-            {                  
-              int
-                state,
-                next;
-
-              char
-                brkused,
-                quoted;
-
-              state=0;
-              next=0;
-              while(tokenizer(0, newstr, inputlen, token, "", "#", "", 0,
-                &brkused, &next, &quoted)==0)
-              {
-                if (state == 0)
-                  dataset = (unsigned char) atoi(newstr);
-                else
-                   if (state == 1)
-                     recnum = (unsigned char) atoi(newstr);
-                state++;
-              }
-            }
-          else
-            if (state == 1)
-              {
-                int
-                  next;
-
-                unsigned long
-                  len;
-
-                char
-                  brkused,
-                  quoted;
-
-                next=0;
-                len = strlen(token);
-                while(tokenizer(0, newstr, inputlen, token, "", "&", "", 0,
-                  &brkused, &next, &quoted)==0)
-                {
-                  if (brkused && next > 0)
-                    {
-                      char
-                        *s = &token[next-1];
-
-                      len -= convertHTMLcodes(s, strlen(s));
-                    }
-                }
-
-                fputc(0x1c, ofile);
-                fputc(dataset, ofile);
-                fputc(recnum, ofile);
-                if (len < 0x10000)
-                  {
-                    fputc((len >> 8) & 255, ofile);
-                    fputc(len & 255, ofile);
-                  }
-                else
-                  {
-                    fputc(((len >> 24) & 255) | 0x80, ofile);
-                    fputc((len >> 16) & 255, ofile);
-                    fputc((len >> 8) & 255, ofile);
-                    fputc(len & 255, ofile);
-                  }
-                next=0;
-                while (len--)
-                  fputc(token[next++], ofile);
-              }
-          state++;
-        }
-        free(token);
-        token = (char *)NULL;
-        free(newstr);
-        newstr = (char *)NULL;
-      }
-      free(line);
-
-      fclose( ifile );
-      fclose( ofile );
-    }
-
-  return 0;
-}
-
-/*
-	This routine is a generalized, finite state token parser. It allows
-    you extract tokens one at a time from a string of characters.  The
-    characters used for white space, for break characters, and for quotes
-    can be specified. Also, characters in the string can be preceded by
-    a specifiable escape character which removes any special meaning the
-    character may have.
-
-	There are a lot of formal parameters in this subroutine call, but
-	once you get familiar with them, this routine is fairly easy to use.
-	"#define" macros can be used to generate simpler looking calls for
-	commonly used applications of this routine.
-
-	First, some terminology:
-
-	token:		used here, a single unit of information in
-				the form of a group of characters.
-
-	white space:	space that gets ignored (except within quotes
-				or when escaped), like blanks and tabs.  in
-				addition, white space terminates a non-quoted
-				token.
-
-	break character: a character that separates non-quoted tokens.
-				commas are a common break character.  the
-				usage of break characters to signal the end
-				of a token is the same as that of white space,
-				except multiple break characters with nothing
-				or only white space between generate a null
-				token for each two break characters together.
-
-				for example, if blank is set to be the white
-				space and comma is set to be the break
-				character, the line ...
-
-				A, B, C ,  , DEF
-
-				... consists of 5 tokens:
-
-				1)	"A"
-				2)	"B"
-				3)	"C"
-				4)	""      (the null string)
-				5)	"DEF"
-
-	quote character: 	a character that, when surrounding a group
-				of other characters, causes the group of
-				characters to be treated as a single token,
-				no matter how many white spaces or break
-				characters exist in the group.	also, a
-				token always terminates after the closing
-				quote.	for example, if ' is the quote
-				character, blank is white space, and comma
-				is the break character, the following
-				string ...
-
-				A, ' B, CD'EF GHI
-
-				... consists of 4 tokens:
-
-				1)	"A"
-				2)	" B, CD" (note the blanks & comma)
-				3)	"EF"
-				4)	"GHI"
-
-				the quote characters themselves do
-				not appear in the resultant tokens.  the
-				double quotes are delimiters i use here for
-				documentation purposes only.
-
-	escape character:	a character which itself is ignored but
-				which causes the next character to be
-				used as is.  ^ and \ are often used as
-				escape characters.  an escape in the last
-				position of the string gets treated as a
-				"normal" (i.e., non-quote, non-white,
-				non-break, and non-escape) character.
-				for example, assume white space, break
-				character, and quote are the same as in the
-				above examples, and further, assume that
-				^ is the escape character.  then, in the
-				string ...
-
-				ABC, ' DEF ^' GH' I ^ J K^ L ^
-
-				... there are 7 tokens:
-
-				1)	"ABC"
-				2)	" DEF ' GH"
-				3)	"I"
-				4)	" "     (a lone blank)
-				5)	"J"
-				6)	"K L"
-				7)	"^"     (passed as is at end of line)
-
-
-	OK, now that you have this background, here's how to call "tokenizer":
-
-	result=tokenizer(flag,token,maxtok,string,white,break,quote,escape,
-		      brkused,next,quoted)
-
-	result: 	0 if we haven't reached EOS (end of string), and
-			1 if we have (this is an "int").
-
-	flag:		right now, only the low order 3 bits are used.
-			1 => convert non-quoted tokens to upper case
-			2 => convert non-quoted tokens to lower case
-			0 => do not convert non-quoted tokens
-			(this is a "char").
-
-	token:		a character string containing the returned next token
-			(this is a "char[]").
-
-	maxtok: 	the maximum size of "token".  characters beyond
-			"maxtok" are truncated (this is an "int").
-
-	string: 	the string to be parsed (this is a "char[]").
-
-	white:		a string of the valid white spaces.  example:
-
-			char whitesp[]={" \t"};
-
-			blank and tab will be valid white space (this is
-			a "char[]").
-
-	break:		a string of the valid break characters.  example:
-
-			char breakch[]={";,"};
-
-			semicolon and comma will be valid break characters
-			(this is a "char[]").
-
-			IMPORTANT:  do not use the name "break" as a C
-			variable, as this is a reserved word in C.
-
-	quote:		a string of the valid quote characters.  an example
-			would be
-
-			char whitesp[]={"'\"");
-
-			(this causes single and double quotes to be valid)
-			note that a token starting with one of these characters
-			needs the same quote character to terminate it.
-
-			for example,
-
-			"ABC '
-
-			is unterminated, but
-
-			"DEF" and 'GHI'
-
-			are properly terminated.  note that different quote
-			characters can appear on the same line; only for
-			a given token do the quote characters have to be
-			the same (this is a "char[]").
-
-	escape: 	the escape character (NOT a string ... only one
-			allowed).  use zero if none is desired (this is
-			a "char").
-
-	brkused:	the break character used to terminate the current
-			token.	if the token was quoted, this will be the
-			quote used.  if the token is the last one on the
-			line, this will be zero (this is a pointer to a
-			"char").
-
-	next:		this variable points to the first character of the
-			next token.  it gets reset by "tokenizer" as it steps
-			through the string.  set it to 0 upon initialization,
-			and leave it alone after that.	you can change it
-			if you want to jump around in the string or re-parse
-			from the beginning, but be careful (this is a
-			pointer to an "int").
-
-	quoted: 	set to 1 (true) if the token was quoted and 0 (false)
-			if not.  you may need this information (for example:
-			in C, a string with quotes around it is a character
-			string, while one without is an identifier).
-
-			(this is a pointer to a "char").
-*/
-
-/* states */
-
-#define IN_WHITE 0
-#define IN_TOKEN 1
-#define IN_QUOTE 2
-#define IN_OZONE 3
-
-int _p_state;	   /* current state	 */
-unsigned _p_flag;  /* option flag	 */
-char _p_curquote;  /* current quote char */
-int _p_tokpos;	   /* current token pos  */
-
-/* routine to find character in string ... used only by "tokenizer" */
-
-int sindex(char ch,char *string)
-{
-  char *cp;
-  for(cp=string;*cp;++cp)
-    if(ch==*cp)
-      return (int)(cp-string);	/* return postion of character */
-  return -1;			/* eol ... no match found */
-}
-
-/* routine to store a character in a string ... used only by "tokenizer" */
-
-void chstore(char *string,int max,char ch)
-{
-  char c;
-  if(_p_tokpos>=0&&_p_tokpos<max-1)
-  {
-    if(_p_state==IN_QUOTE)
-      c=ch;
-    else
-      switch(_p_flag&3)
-      {
-	    case 1: 	    /* convert to upper */
-	      c=toupper(ch);
-	      break;
-
-	    case 2: 	    /* convert to lower */
-	      c=tolower(ch);
-	      break;
-
-	    default:	    /* use as is */
-	      c=ch;
-	      break;
-      }
-    string[_p_tokpos++]=c;
-  }
-  return;
-}
-
-int tokenizer(unsigned inflag,char *token,int tokmax,char *line,
-  char *white,char *brkchar,char *quote,char eschar,char *brkused,
-    int *next,char *quoted)
-{
-  int qp;
-  char c,nc;
-
-  *brkused=0;		/* initialize to null */
-  *quoted=0;		/* assume not quoted  */
-
-  if(!line[*next])	/* if we're at end of line, indicate such */
-    return 1;
-
-  _p_state=IN_WHITE;   /* initialize state */
-  _p_curquote=0;	   /* initialize previous quote char */
-  _p_flag=inflag;	   /* set option flag */
-
-  for(_p_tokpos=0;(c=line[*next]);++(*next))	/* main loop */
-  {
-    if((qp=sindex(c,brkchar))>=0)  /* break */
-    {
-      switch(_p_state)
-      {
-	    case IN_WHITE:		/* these are the same here ...	*/
-	    case IN_TOKEN:		/* ... just get out		*/
-	    case IN_OZONE:		/* ditto			*/
-	      ++(*next);
-	      *brkused=brkchar[qp];
-	      goto byebye;
-
-	    case IN_QUOTE:		 /* just keep going */
-	      chstore(token,tokmax,c);
-	      break;
-      }
-    }
-    else if((qp=sindex(c,quote))>=0)  /* quote */
-    {
-      switch(_p_state)
-      {
-	    case IN_WHITE:	 /* these are identical, */
-	      _p_state=IN_QUOTE; /* change states   */
-	      _p_curquote=quote[qp]; /* save quote char */
-	      *quoted=1;	/* set to true as long as something is in quotes */
-	      break;
-
-	    case IN_QUOTE:
-	      if(quote[qp]==_p_curquote) /* same as the beginning quote? */
-	      {
-	        _p_state=IN_OZONE;
-	        _p_curquote=0;
-	      }
-	      else
-	        chstore(token,tokmax,c); /* treat as regular char */
-	      break;
-
-	    case IN_TOKEN:
-	    case IN_OZONE:
-	      *brkused=c; /* uses quote as break char */
-	      goto byebye;
-      }
-    }
-    else if((qp=sindex(c,white))>=0) /* white */
-    {
-      switch(_p_state)
-      {
-	    case IN_WHITE:
-	    case IN_OZONE:
-	      break;		/* keep going */
-
-	    case IN_TOKEN:
-	      _p_state=IN_OZONE;
-	      break;
-
-	    case IN_QUOTE:
-	      chstore(token,tokmax,c); /* it's valid here */
-	      break;
-      }
-    }
-    else if(c==eschar)  /* escape */
-    {
-      nc=line[(*next)+1];
-      if(nc==0) 		/* end of line */
-      {
-	    *brkused=0;
-	    chstore(token,tokmax,c);
-	    ++(*next);
-	    goto byebye;
-      }
-      switch(_p_state)
-      {
-	    case IN_WHITE:
-	      --(*next);
-	      _p_state=IN_TOKEN;
-	      break;
-
-	    case IN_TOKEN:
-	    case IN_QUOTE:
-	      ++(*next);
-	      chstore(token,tokmax,nc);
-	      break;
-
-	    case IN_OZONE:
-	      goto byebye;
-      }
-    }
-    else	/* anything else is just a real character */
-    {
-      switch(_p_state)
-      {
-	    case IN_WHITE:
-	      _p_state=IN_TOKEN; /* switch states */
-
-	    case IN_TOKEN:		 /* these 2 are     */
-	    case IN_QUOTE:		 /*  identical here */
-	      chstore(token,tokmax,c);
-	      break;
-
-	    case IN_OZONE:
-	      goto byebye;
-      }
-    }
-  }		/* end of main loop */
-
-byebye:
-  token[_p_tokpos]=0;	/* make sure token ends with EOS */
-
-  return 0;
-}
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 8
- * fill-column: 78
- * End:
- */
diff --git a/tiff/contrib/iptcutil/test.iptc b/tiff/contrib/iptcutil/test.iptc
deleted file mode 100644
index a260562..0000000
--- a/tiff/contrib/iptcutil/test.iptc
+++ /dev/null
diff --git a/tiff/contrib/iptcutil/test.txt b/tiff/contrib/iptcutil/test.txt
deleted file mode 100644
index d518100..0000000
--- a/tiff/contrib/iptcutil/test.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-2#0="&#0;&#2;"
-2#120#Caption="Chairman of the US House Judiciary Committee, Henry Hyde,R-IL, makes his opening statement during impeachment hearings 11 December on Capitol Hill in Washington, DC. The committee is debating the articles of impechment and my take a vote on the impeachment of US President BIll Clinton on charges that he obstucted justice, lied and abused the power of his office as early as today.    AFP PHOTO Paul J. RICHARDS&#13;"
-2#122#Caption Writer="kb/lt"
-2#100#Country Code="USA"
-2#105#Headline="Old fart squeezing two fingers."
-2#30#Release Date="19981211"
-2#35#Release Time="000000+0000"
-2#40#Special Instructions="This is a test. This is only a test. ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890"
-2#80#Byline="PAUL J. RICHARDS"
-2#85#Byline Title="STF"
-2#110#Credit="AFP"
-2#65#Originating Program="MacDesk Reporter"
-2#115#Source="AFP"
-2#5#Image Name="US-HYDE"
-2#55#Created Date="19981211"
-2#90#City="WASHINGTON"
-2#95#Province State="DC"
-2#101#Country="UNITED STATES"
-2#103#Original Transmission Reference="DCA03"
-2#15#Category="POL"
-2#20#Supplemental Category="GOVERNMENT"
-2#10#Priority="5"
-2#25#Keyword="fart"
-2#25#Keyword="squeezing"
-2#25#Keyword="old"
-2#25#Keyword="fingers"
-2#75#Object Cycle="a"
-2#60#Created Time="000000+0000"
-2#70#Program Version="2.0.3"
-2#130="3S"
-2#135="GB"
-2#231="Kaya A. Hoffmann 12/14/98 12:00:44 PM  Copy To : Selects - \\KINYANI\Selects&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;&#0;"