Merge branch 'develop'

1 files changed, 335 insertions, 381 deletions

diff --git a/app/lzo/Makefile.in b/app/lzo/Makefile.in
index b0395ea8..6b77e152 100644
--- a/app/lzo/Makefile.in
+++ b/app/lzo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 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.
+# Copyright (C) 1994-2013 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.
@@ -20,7 +19,7 @@
 #
 #  This file is part of the LZO data compression library.
 #
-#  Copyright (C) 1996-2011 Markus Franz Xaver Johannes Oberhumer
+#  Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
 #  All Rights Reserved.
 #
 
@@ -28,6 +27,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,14 +98,21 @@ noinst_PROGRAMS = examples/dict$(EXEEXT) examples/lzopack$(EXEEXT) \
 	tests/chksum$(EXEEXT) tests/promote$(EXEEXT) \
 	tests/sizes$(EXEEXT) minilzo/testmini$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.hin $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS THANKS autoconf/compile \
-	autoconf/config.guess autoconf/config.rpath \
-	autoconf/config.sub autoconf/depcomp autoconf/install-sh \
-	autoconf/ltmain.sh autoconf/mdate-sh autoconf/missing \
-	autoconf/mkinstalldirs autoconf/py-compile autoconf/ylwrap
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.hin $(top_srcdir)/autoconf/mkinstalldirs \
+	$(top_srcdir)/autoconf/depcomp $(pkginclude_HEADERS) COPYING \
+	THANKS autoconf/compile autoconf/config.guess \
+	autoconf/config.rpath autoconf/config.sub autoconf/depcomp \
+	autoconf/install-sh autoconf/mdate-sh autoconf/missing \
+	autoconf/mkinstalldirs autoconf/py-compile autoconf/ylwrap \
+	autoconf/ltmain.sh $(top_srcdir)/autoconf/compile \
+	$(top_srcdir)/autoconf/config.guess \
+	$(top_srcdir)/autoconf/config.sub \
+	$(top_srcdir)/autoconf/install-sh \
+	$(top_srcdir)/autoconf/ltmain.sh \
+	$(top_srcdir)/autoconf/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/autoconf/local.m4 \
 	$(top_srcdir)/configure.ac
@@ -94,6 +145,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \
 	"$(DESTDIR)$(pkgincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -119,19 +176,17 @@ am_src_liblzo2_la_OBJECTS = src/lzo1.lo src/lzo1_99.lo src/lzo1a.lo \
 	src/lzo2a_d2.lo src/lzo_crc.lo src/lzo_init.lo src/lzo_ptr.lo \
 	src/lzo_str.lo src/lzo_util.lo
 am__objects_1 = asm/i386/src_gas/lzo1c_s1.lo \
-	asm/i386/src_gas/lzo1c_s2.lo asm/i386/src_gas/lzo1f_f1.lo \
-	asm/i386/src_gas/lzo1f_f2.lo asm/i386/src_gas/lzo1x_f1.lo \
-	asm/i386/src_gas/lzo1x_f2.lo asm/i386/src_gas/lzo1x_s1.lo \
-	asm/i386/src_gas/lzo1x_s2.lo asm/i386/src_gas/lzo1y_f1.lo \
-	asm/i386/src_gas/lzo1y_f2.lo asm/i386/src_gas/lzo1y_s1.lo \
-	asm/i386/src_gas/lzo1y_s2.lo
+	asm/i386/src_gas/lzo1f_f1.lo asm/i386/src_gas/lzo1x_f1.lo \
+	asm/i386/src_gas/lzo1x_s1.lo asm/i386/src_gas/lzo1y_f1.lo \
+	asm/i386/src_gas/lzo1y_s1.lo
 @LZO_USE_ASM_i386_src_gas_TRUE@am__objects_2 = $(am__objects_1)
 nodist_src_liblzo2_la_OBJECTS = $(am__objects_2)
 src_liblzo2_la_OBJECTS = $(am_src_liblzo2_la_OBJECTS) \
 	$(nodist_src_liblzo2_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 src_liblzo2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_liblzo2_la_LDFLAGS) $(LDFLAGS) -o \
@@ -183,6 +238,18 @@ tests_promote_DEPENDENCIES =
 am_tests_sizes_OBJECTS = tests/sizes.$(OBJEXT)
 tests_sizes_OBJECTS = $(am_tests_sizes_OBJECTS)
 tests_sizes_DEPENDENCIES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
 am__depfiles_maybe = depfiles
@@ -193,31 +260,28 @@ LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CCASFLAGS) $(CCASFLAGS)
-AM_V_CPPAS = $(am__v_CPPAS_$(V))
-am__v_CPPAS_ = $(am__v_CPPAS_$(AM_DEFAULT_VERBOSITY))
-am__v_CPPAS_0 = @echo "  CPPAS " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
+am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
+am__v_CPPAS_0 = @echo "  CPPAS   " $@;
+am__v_CPPAS_1 = 
 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_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 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   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(src_liblzo2_la_SOURCES) $(nodist_src_liblzo2_la_SOURCES) \
 	$(examples_dict_SOURCES) $(examples_lzopack_SOURCES) \
 	$(examples_overlap_SOURCES) $(examples_precomp_SOURCES) \
@@ -232,20 +296,51 @@ DIST_SOURCES = $(src_liblzo2_la_SOURCES) $(examples_dict_SOURCES) \
 	$(minilzo_testmini_SOURCES) $(tests_align_SOURCES) \
 	$(tests_chksum_SOURCES) $(tests_promote_SOURCES) \
 	$(tests_sizes_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(doc_DATA)
 HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.hin
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -266,6 +361,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -290,6 +386,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -315,6 +412,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -375,12 +473,12 @@ EXTRA_DIST = BUGS autoconf/shtool src/compr1b.h src/compr1c.h \
 	src/lzo1b_r.ch src/lzo1b_sm.ch src/lzo1b_tm.ch src/lzo1c_cc.h \
 	src/lzo1f_d.ch src/lzo1x_c.ch src/lzo1x_d.ch src/lzo1x_oo.ch \
 	src/lzo2a_d.ch src/lzo_conf.h src/lzo_dict.h src/lzo_dll.ch \
-	src/lzo_func.ch src/lzo_mchw.ch src/lzo_ptr.h src/lzo_swd.ch \
-	src/miniacc.h src/stats1a.h src/stats1b.h src/stats1c.h \
+	src/lzo_func.h src/lzo_mchw.ch src/lzo_ptr.h src/lzo_supp.h \
+	src/lzo_swd.ch src/stats1a.h src/stats1b.h src/stats1c.h \
 	examples/portab.h examples/portab_a.h lzotest/asm.h \
 	lzotest/db.h lzotest/wrap.h lzotest/wrapmisc.h \
 	minilzo/Makefile.minilzo minilzo/README.LZO minilzo/minilzo.h
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
 LDADD = src/liblzo2.la
 lib_LTLIBRARIES = src/liblzo2.la
 doc_DATA = AUTHORS COPYING NEWS THANKS doc/LZO.FAQ doc/LZO.TXT doc/LZOAPI.TXT
@@ -391,7 +489,7 @@ pkginclude_HEADERS = \
     include/lzo/lzo_asm.h include/lzo/lzoconf.h include/lzo/lzodefs.h \
     include/lzo/lzoutil.h
 
-src_liblzo2_la_LDFLAGS = -version-info 2:0:0 $(AM_LDFLAGS)
+src_liblzo2_la_LDFLAGS = -version-info 2:0:0 -no-undefined $(AM_LDFLAGS)
 src_liblzo2_la_SOURCES = \
     src/lzo1.c src/lzo1_99.c src/lzo1a.c src/lzo1a_99.c src/lzo1b_1.c \
     src/lzo1b_2.c src/lzo1b_3.c src/lzo1b_4.c src/lzo1b_5.c src/lzo1b_6.c \
@@ -411,20 +509,20 @@ src_liblzo2_la_SOURCES = \
     src/lzo_str.c src/lzo_util.c
 
 LZO_ASM_SOURCES_i386_src_gas = \
-    asm/i386/src_gas/lzo1c_s1.S asm/i386/src_gas/lzo1c_s2.S \
-    asm/i386/src_gas/lzo1f_f1.S asm/i386/src_gas/lzo1f_f2.S \
-    asm/i386/src_gas/lzo1x_f1.S asm/i386/src_gas/lzo1x_f2.S \
-    asm/i386/src_gas/lzo1x_s1.S asm/i386/src_gas/lzo1x_s2.S \
-    asm/i386/src_gas/lzo1y_f1.S asm/i386/src_gas/lzo1y_f2.S \
-    asm/i386/src_gas/lzo1y_s1.S asm/i386/src_gas/lzo1y_s2.S
+    asm/i386/src_gas/lzo1c_s1.S \
+    asm/i386/src_gas/lzo1f_f1.S \
+    asm/i386/src_gas/lzo1x_f1.S \
+    asm/i386/src_gas/lzo1x_s1.S \
+    asm/i386/src_gas/lzo1y_f1.S \
+    asm/i386/src_gas/lzo1y_s1.S
 
 LZO_ASM_OBJECTS_i386_obj_elf32 = \
-    asm/i386/obj/elf32/lzo1c_s1.o asm/i386/obj/elf32/lzo1c_s2.o \
-    asm/i386/obj/elf32/lzo1f_f1.o asm/i386/obj/elf32/lzo1f_f2.o \
-    asm/i386/obj/elf32/lzo1x_f1.o asm/i386/obj/elf32/lzo1x_f2.o \
-    asm/i386/obj/elf32/lzo1x_s1.o asm/i386/obj/elf32/lzo1x_s2.o \
-    asm/i386/obj/elf32/lzo1y_f1.o asm/i386/obj/elf32/lzo1y_f2.o \
-    asm/i386/obj/elf32/lzo1y_s1.o asm/i386/obj/elf32/lzo1y_s2.o
+    asm/i386/obj/elf32/lzo1c_s1.o \
+    asm/i386/obj/elf32/lzo1f_f1.o \
+    asm/i386/obj/elf32/lzo1x_f1.o \
+    asm/i386/obj/elf32/lzo1x_s1.o \
+    asm/i386/obj/elf32/lzo1y_f1.o \
+    asm/i386/obj/elf32/lzo1y_s1.o
 
 @LZO_USE_ASM_i386_src_gas_TRUE@LZO_ASM_SOURCES = $(LZO_ASM_SOURCES_i386_src_gas)
 @LZO_USE_ASM_i386_obj_elf32_TRUE@LZO_ASM_OBJECTS = $(LZO_ASM_OBJECTS_i386_obj_elf32)
@@ -445,15 +543,15 @@ tests_promote_LDADD =
 tests_sizes_LDADD = 
 minilzo_testmini_SOURCES = minilzo/testmini.c minilzo/minilzo.c
 minilzo_testmini_SHORTNAME = t
-minilzo_testmini_CPPFLAGS = -DMINILZO_HAVE_CONFIG_H=1 \
-	-I$(top_srcdir)/include/lzo $(AM_CPPFLAGS)
+minilzo_testmini_CPPFLAGS = $(AM_CPPFLAGS) -DMINILZO_HAVE_CONFIG_H=1 \
+	-I$(top_srcdir)/include/lzo
 minilzo_testmini_LDADD = 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -489,10 +587,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -504,9 +600,9 @@ $(srcdir)/config.hin: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -514,6 +610,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -529,12 +627,14 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 src/$(am__dirstamp):
 	@$(MKDIR_P) src
 	@: > src/$(am__dirstamp)
@@ -616,29 +716,18 @@ asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp):
 	@: > asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
 asm/i386/src_gas/lzo1c_s1.lo: asm/i386/src_gas/$(am__dirstamp) \
 	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-asm/i386/src_gas/lzo1c_s2.lo: asm/i386/src_gas/$(am__dirstamp) \
-	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
 asm/i386/src_gas/lzo1f_f1.lo: asm/i386/src_gas/$(am__dirstamp) \
 	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-asm/i386/src_gas/lzo1f_f2.lo: asm/i386/src_gas/$(am__dirstamp) \
-	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
 asm/i386/src_gas/lzo1x_f1.lo: asm/i386/src_gas/$(am__dirstamp) \
 	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-asm/i386/src_gas/lzo1x_f2.lo: asm/i386/src_gas/$(am__dirstamp) \
-	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
 asm/i386/src_gas/lzo1x_s1.lo: asm/i386/src_gas/$(am__dirstamp) \
 	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-asm/i386/src_gas/lzo1x_s2.lo: asm/i386/src_gas/$(am__dirstamp) \
-	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
 asm/i386/src_gas/lzo1y_f1.lo: asm/i386/src_gas/$(am__dirstamp) \
 	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-asm/i386/src_gas/lzo1y_f2.lo: asm/i386/src_gas/$(am__dirstamp) \
-	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
 asm/i386/src_gas/lzo1y_s1.lo: asm/i386/src_gas/$(am__dirstamp) \
 	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-asm/i386/src_gas/lzo1y_s2.lo: asm/i386/src_gas/$(am__dirstamp) \
-	asm/i386/src_gas/$(DEPDIR)/$(am__dirstamp)
-src/liblzo2.la: $(src_liblzo2_la_OBJECTS) $(src_liblzo2_la_DEPENDENCIES) src/$(am__dirstamp)
+
+src/liblzo2.la: $(src_liblzo2_la_OBJECTS) $(src_liblzo2_la_DEPENDENCIES) $(EXTRA_src_liblzo2_la_DEPENDENCIES) src/$(am__dirstamp)
 	$(AM_V_CCLD)$(src_liblzo2_la_LINK) -rpath $(libdir) $(src_liblzo2_la_OBJECTS) $(src_liblzo2_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
@@ -657,32 +746,38 @@ examples/$(DEPDIR)/$(am__dirstamp):
 	@: > examples/$(DEPDIR)/$(am__dirstamp)
 examples/dict.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
-examples/dict$(EXEEXT): $(examples_dict_OBJECTS) $(examples_dict_DEPENDENCIES) examples/$(am__dirstamp)
+
+examples/dict$(EXEEXT): $(examples_dict_OBJECTS) $(examples_dict_DEPENDENCIES) $(EXTRA_examples_dict_DEPENDENCIES) examples/$(am__dirstamp)
 	@rm -f examples/dict$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(examples_dict_OBJECTS) $(examples_dict_LDADD) $(LIBS)
 examples/lzopack.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
-examples/lzopack$(EXEEXT): $(examples_lzopack_OBJECTS) $(examples_lzopack_DEPENDENCIES) examples/$(am__dirstamp)
+
+examples/lzopack$(EXEEXT): $(examples_lzopack_OBJECTS) $(examples_lzopack_DEPENDENCIES) $(EXTRA_examples_lzopack_DEPENDENCIES) examples/$(am__dirstamp)
 	@rm -f examples/lzopack$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(examples_lzopack_OBJECTS) $(examples_lzopack_LDADD) $(LIBS)
 examples/overlap.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
-examples/overlap$(EXEEXT): $(examples_overlap_OBJECTS) $(examples_overlap_DEPENDENCIES) examples/$(am__dirstamp)
+
+examples/overlap$(EXEEXT): $(examples_overlap_OBJECTS) $(examples_overlap_DEPENDENCIES) $(EXTRA_examples_overlap_DEPENDENCIES) examples/$(am__dirstamp)
 	@rm -f examples/overlap$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(examples_overlap_OBJECTS) $(examples_overlap_LDADD) $(LIBS)
 examples/precomp.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
-examples/precomp$(EXEEXT): $(examples_precomp_OBJECTS) $(examples_precomp_DEPENDENCIES) examples/$(am__dirstamp)
+
+examples/precomp$(EXEEXT): $(examples_precomp_OBJECTS) $(examples_precomp_DEPENDENCIES) $(EXTRA_examples_precomp_DEPENDENCIES) examples/$(am__dirstamp)
 	@rm -f examples/precomp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(examples_precomp_OBJECTS) $(examples_precomp_LDADD) $(LIBS)
 examples/precomp2.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
-examples/precomp2$(EXEEXT): $(examples_precomp2_OBJECTS) $(examples_precomp2_DEPENDENCIES) examples/$(am__dirstamp)
+
+examples/precomp2$(EXEEXT): $(examples_precomp2_OBJECTS) $(examples_precomp2_DEPENDENCIES) $(EXTRA_examples_precomp2_DEPENDENCIES) examples/$(am__dirstamp)
 	@rm -f examples/precomp2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(examples_precomp2_OBJECTS) $(examples_precomp2_LDADD) $(LIBS)
 examples/simple.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
-examples/simple$(EXEEXT): $(examples_simple_OBJECTS) $(examples_simple_DEPENDENCIES) examples/$(am__dirstamp)
+
+examples/simple$(EXEEXT): $(examples_simple_OBJECTS) $(examples_simple_DEPENDENCIES) $(EXTRA_examples_simple_DEPENDENCIES) examples/$(am__dirstamp)
 	@rm -f examples/simple$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(examples_simple_OBJECTS) $(examples_simple_LDADD) $(LIBS)
 lzotest/$(am__dirstamp):
@@ -693,7 +788,8 @@ lzotest/$(DEPDIR)/$(am__dirstamp):
 	@: > lzotest/$(DEPDIR)/$(am__dirstamp)
 lzotest/lzotest.$(OBJEXT): lzotest/$(am__dirstamp) \
 	lzotest/$(DEPDIR)/$(am__dirstamp)
-lzotest/lzotest$(EXEEXT): $(lzotest_lzotest_OBJECTS) $(lzotest_lzotest_DEPENDENCIES) lzotest/$(am__dirstamp)
+
+lzotest/lzotest$(EXEEXT): $(lzotest_lzotest_OBJECTS) $(lzotest_lzotest_DEPENDENCIES) $(EXTRA_lzotest_lzotest_DEPENDENCIES) lzotest/$(am__dirstamp)
 	@rm -f lzotest/lzotest$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(lzotest_lzotest_OBJECTS) $(lzotest_lzotest_LDADD) $(LIBS)
 minilzo/$(am__dirstamp):
@@ -706,7 +802,8 @@ minilzo/t-testmini.$(OBJEXT): minilzo/$(am__dirstamp) \
 	minilzo/$(DEPDIR)/$(am__dirstamp)
 minilzo/t-minilzo.$(OBJEXT): minilzo/$(am__dirstamp) \
 	minilzo/$(DEPDIR)/$(am__dirstamp)
-minilzo/testmini$(EXEEXT): $(minilzo_testmini_OBJECTS) $(minilzo_testmini_DEPENDENCIES) minilzo/$(am__dirstamp)
+
+minilzo/testmini$(EXEEXT): $(minilzo_testmini_OBJECTS) $(minilzo_testmini_DEPENDENCIES) $(EXTRA_minilzo_testmini_DEPENDENCIES) minilzo/$(am__dirstamp)
 	@rm -f minilzo/testmini$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(minilzo_testmini_OBJECTS) $(minilzo_testmini_LDADD) $(LIBS)
 tests/$(am__dirstamp):
@@ -717,214 +814,49 @@ tests/$(DEPDIR)/$(am__dirstamp):
 	@: > tests/$(DEPDIR)/$(am__dirstamp)
 tests/align.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/align$(EXEEXT): $(tests_align_OBJECTS) $(tests_align_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/align$(EXEEXT): $(tests_align_OBJECTS) $(tests_align_DEPENDENCIES) $(EXTRA_tests_align_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/align$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_align_OBJECTS) $(tests_align_LDADD) $(LIBS)
 tests/chksum.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/chksum$(EXEEXT): $(tests_chksum_OBJECTS) $(tests_chksum_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/chksum$(EXEEXT): $(tests_chksum_OBJECTS) $(tests_chksum_DEPENDENCIES) $(EXTRA_tests_chksum_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/chksum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_chksum_OBJECTS) $(tests_chksum_LDADD) $(LIBS)
 tests/promote.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/promote$(EXEEXT): $(tests_promote_OBJECTS) $(tests_promote_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/promote$(EXEEXT): $(tests_promote_OBJECTS) $(tests_promote_DEPENDENCIES) $(EXTRA_tests_promote_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/promote$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_promote_OBJECTS) $(tests_promote_LDADD) $(LIBS)
 tests/sizes.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
-tests/sizes$(EXEEXT): $(tests_sizes_OBJECTS) $(tests_sizes_DEPENDENCIES) tests/$(am__dirstamp)
+
+tests/sizes$(EXEEXT): $(tests_sizes_OBJECTS) $(tests_sizes_DEPENDENCIES) $(EXTRA_tests_sizes_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/sizes$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_sizes_OBJECTS) $(tests_sizes_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1c_s1.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1c_s1.lo
-	-rm -f asm/i386/src_gas/lzo1c_s2.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1c_s2.lo
-	-rm -f asm/i386/src_gas/lzo1f_f1.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1f_f1.lo
-	-rm -f asm/i386/src_gas/lzo1f_f2.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1f_f2.lo
-	-rm -f asm/i386/src_gas/lzo1x_f1.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1x_f1.lo
-	-rm -f asm/i386/src_gas/lzo1x_f2.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1x_f2.lo
-	-rm -f asm/i386/src_gas/lzo1x_s1.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1x_s1.lo
-	-rm -f asm/i386/src_gas/lzo1x_s2.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1x_s2.lo
-	-rm -f asm/i386/src_gas/lzo1y_f1.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1y_f1.lo
-	-rm -f asm/i386/src_gas/lzo1y_f2.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1y_f2.lo
-	-rm -f asm/i386/src_gas/lzo1y_s1.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1y_s1.lo
-	-rm -f asm/i386/src_gas/lzo1y_s2.$(OBJEXT)
-	-rm -f asm/i386/src_gas/lzo1y_s2.lo
-	-rm -f examples/dict.$(OBJEXT)
-	-rm -f examples/lzopack.$(OBJEXT)
-	-rm -f examples/overlap.$(OBJEXT)
-	-rm -f examples/precomp.$(OBJEXT)
-	-rm -f examples/precomp2.$(OBJEXT)
-	-rm -f examples/simple.$(OBJEXT)
-	-rm -f lzotest/lzotest.$(OBJEXT)
-	-rm -f minilzo/t-minilzo.$(OBJEXT)
-	-rm -f minilzo/t-testmini.$(OBJEXT)
-	-rm -f src/lzo1.$(OBJEXT)
-	-rm -f src/lzo1.lo
-	-rm -f src/lzo1_99.$(OBJEXT)
-	-rm -f src/lzo1_99.lo
-	-rm -f src/lzo1a.$(OBJEXT)
-	-rm -f src/lzo1a.lo
-	-rm -f src/lzo1a_99.$(OBJEXT)
-	-rm -f src/lzo1a_99.lo
-	-rm -f src/lzo1b_1.$(OBJEXT)
-	-rm -f src/lzo1b_1.lo
-	-rm -f src/lzo1b_2.$(OBJEXT)
-	-rm -f src/lzo1b_2.lo
-	-rm -f src/lzo1b_3.$(OBJEXT)
-	-rm -f src/lzo1b_3.lo
-	-rm -f src/lzo1b_4.$(OBJEXT)
-	-rm -f src/lzo1b_4.lo
-	-rm -f src/lzo1b_5.$(OBJEXT)
-	-rm -f src/lzo1b_5.lo
-	-rm -f src/lzo1b_6.$(OBJEXT)
-	-rm -f src/lzo1b_6.lo
-	-rm -f src/lzo1b_7.$(OBJEXT)
-	-rm -f src/lzo1b_7.lo
-	-rm -f src/lzo1b_8.$(OBJEXT)
-	-rm -f src/lzo1b_8.lo
-	-rm -f src/lzo1b_9.$(OBJEXT)
-	-rm -f src/lzo1b_9.lo
-	-rm -f src/lzo1b_99.$(OBJEXT)
-	-rm -f src/lzo1b_99.lo
-	-rm -f src/lzo1b_9x.$(OBJEXT)
-	-rm -f src/lzo1b_9x.lo
-	-rm -f src/lzo1b_cc.$(OBJEXT)
-	-rm -f src/lzo1b_cc.lo
-	-rm -f src/lzo1b_d1.$(OBJEXT)
-	-rm -f src/lzo1b_d1.lo
-	-rm -f src/lzo1b_d2.$(OBJEXT)
-	-rm -f src/lzo1b_d2.lo
-	-rm -f src/lzo1b_rr.$(OBJEXT)
-	-rm -f src/lzo1b_rr.lo
-	-rm -f src/lzo1b_xx.$(OBJEXT)
-	-rm -f src/lzo1b_xx.lo
-	-rm -f src/lzo1c_1.$(OBJEXT)
-	-rm -f src/lzo1c_1.lo
-	-rm -f src/lzo1c_2.$(OBJEXT)
-	-rm -f src/lzo1c_2.lo
-	-rm -f src/lzo1c_3.$(OBJEXT)
-	-rm -f src/lzo1c_3.lo
-	-rm -f src/lzo1c_4.$(OBJEXT)
-	-rm -f src/lzo1c_4.lo
-	-rm -f src/lzo1c_5.$(OBJEXT)
-	-rm -f src/lzo1c_5.lo
-	-rm -f src/lzo1c_6.$(OBJEXT)
-	-rm -f src/lzo1c_6.lo
-	-rm -f src/lzo1c_7.$(OBJEXT)
-	-rm -f src/lzo1c_7.lo
-	-rm -f src/lzo1c_8.$(OBJEXT)
-	-rm -f src/lzo1c_8.lo
-	-rm -f src/lzo1c_9.$(OBJEXT)
-	-rm -f src/lzo1c_9.lo
-	-rm -f src/lzo1c_99.$(OBJEXT)
-	-rm -f src/lzo1c_99.lo
-	-rm -f src/lzo1c_9x.$(OBJEXT)
-	-rm -f src/lzo1c_9x.lo
-	-rm -f src/lzo1c_cc.$(OBJEXT)
-	-rm -f src/lzo1c_cc.lo
-	-rm -f src/lzo1c_d1.$(OBJEXT)
-	-rm -f src/lzo1c_d1.lo
-	-rm -f src/lzo1c_d2.$(OBJEXT)
-	-rm -f src/lzo1c_d2.lo
-	-rm -f src/lzo1c_rr.$(OBJEXT)
-	-rm -f src/lzo1c_rr.lo
-	-rm -f src/lzo1c_xx.$(OBJEXT)
-	-rm -f src/lzo1c_xx.lo
-	-rm -f src/lzo1f_1.$(OBJEXT)
-	-rm -f src/lzo1f_1.lo
-	-rm -f src/lzo1f_9x.$(OBJEXT)
-	-rm -f src/lzo1f_9x.lo
-	-rm -f src/lzo1f_d1.$(OBJEXT)
-	-rm -f src/lzo1f_d1.lo
-	-rm -f src/lzo1f_d2.$(OBJEXT)
-	-rm -f src/lzo1f_d2.lo
-	-rm -f src/lzo1x_1.$(OBJEXT)
-	-rm -f src/lzo1x_1.lo
-	-rm -f src/lzo1x_1k.$(OBJEXT)
-	-rm -f src/lzo1x_1k.lo
-	-rm -f src/lzo1x_1l.$(OBJEXT)
-	-rm -f src/lzo1x_1l.lo
-	-rm -f src/lzo1x_1o.$(OBJEXT)
-	-rm -f src/lzo1x_1o.lo
-	-rm -f src/lzo1x_9x.$(OBJEXT)
-	-rm -f src/lzo1x_9x.lo
-	-rm -f src/lzo1x_d1.$(OBJEXT)
-	-rm -f src/lzo1x_d1.lo
-	-rm -f src/lzo1x_d2.$(OBJEXT)
-	-rm -f src/lzo1x_d2.lo
-	-rm -f src/lzo1x_d3.$(OBJEXT)
-	-rm -f src/lzo1x_d3.lo
-	-rm -f src/lzo1x_o.$(OBJEXT)
-	-rm -f src/lzo1x_o.lo
-	-rm -f src/lzo1y_1.$(OBJEXT)
-	-rm -f src/lzo1y_1.lo
-	-rm -f src/lzo1y_9x.$(OBJEXT)
-	-rm -f src/lzo1y_9x.lo
-	-rm -f src/lzo1y_d1.$(OBJEXT)
-	-rm -f src/lzo1y_d1.lo
-	-rm -f src/lzo1y_d2.$(OBJEXT)
-	-rm -f src/lzo1y_d2.lo
-	-rm -f src/lzo1y_d3.$(OBJEXT)
-	-rm -f src/lzo1y_d3.lo
-	-rm -f src/lzo1y_o.$(OBJEXT)
-	-rm -f src/lzo1y_o.lo
-	-rm -f src/lzo1z_9x.$(OBJEXT)
-	-rm -f src/lzo1z_9x.lo
-	-rm -f src/lzo1z_d1.$(OBJEXT)
-	-rm -f src/lzo1z_d1.lo
-	-rm -f src/lzo1z_d2.$(OBJEXT)
-	-rm -f src/lzo1z_d2.lo
-	-rm -f src/lzo1z_d3.$(OBJEXT)
-	-rm -f src/lzo1z_d3.lo
-	-rm -f src/lzo2a_9x.$(OBJEXT)
-	-rm -f src/lzo2a_9x.lo
-	-rm -f src/lzo2a_d1.$(OBJEXT)
-	-rm -f src/lzo2a_d1.lo
-	-rm -f src/lzo2a_d2.$(OBJEXT)
-	-rm -f src/lzo2a_d2.lo
-	-rm -f src/lzo_crc.$(OBJEXT)
-	-rm -f src/lzo_crc.lo
-	-rm -f src/lzo_init.$(OBJEXT)
-	-rm -f src/lzo_init.lo
-	-rm -f src/lzo_ptr.$(OBJEXT)
-	-rm -f src/lzo_ptr.lo
-	-rm -f src/lzo_str.$(OBJEXT)
-	-rm -f src/lzo_str.lo
-	-rm -f src/lzo_util.$(OBJEXT)
-	-rm -f src/lzo_util.lo
-	-rm -f tests/align.$(OBJEXT)
-	-rm -f tests/chksum.$(OBJEXT)
-	-rm -f tests/promote.$(OBJEXT)
-	-rm -f tests/sizes.$(OBJEXT)
+	-rm -f asm/i386/src_gas/*.$(OBJEXT)
+	-rm -f asm/i386/src_gas/*.lo
+	-rm -f examples/*.$(OBJEXT)
+	-rm -f lzotest/*.$(OBJEXT)
+	-rm -f minilzo/*.$(OBJEXT)
+	-rm -f src/*.$(OBJEXT)
+	-rm -f src/*.lo
+	-rm -f tests/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1c_s1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1c_s2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1f_f1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1f_f2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1x_f1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1x_f2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1x_s1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1x_s2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1y_f1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1y_f2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1y_s1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@asm/i386/src_gas/$(DEPDIR)/lzo1y_s2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/dict.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/lzopack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/overlap.Po@am__quote@
@@ -1010,87 +942,77 @@ distclean-compile:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(CPPASCOMPILE) -c -o $@ $<
+@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
 
 .S.obj:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .S.lo:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCCAS_TRUE@	$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(LTCPPASCOMPILE) -c -o $@ $<
+@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $<
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 minilzo/t-testmini.o: minilzo/testmini.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT minilzo/t-testmini.o -MD -MP -MF minilzo/$(DEPDIR)/t-testmini.Tpo -c -o minilzo/t-testmini.o `test -f 'minilzo/testmini.c' || echo '$(srcdir)/'`minilzo/testmini.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minilzo/$(DEPDIR)/t-testmini.Tpo minilzo/$(DEPDIR)/t-testmini.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='minilzo/testmini.c' object='minilzo/t-testmini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minilzo/testmini.c' object='minilzo/t-testmini.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-testmini.o `test -f 'minilzo/testmini.c' || echo '$(srcdir)/'`minilzo/testmini.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-testmini.o `test -f 'minilzo/testmini.c' || echo '$(srcdir)/'`minilzo/testmini.c
 
 minilzo/t-testmini.obj: minilzo/testmini.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT minilzo/t-testmini.obj -MD -MP -MF minilzo/$(DEPDIR)/t-testmini.Tpo -c -o minilzo/t-testmini.obj `if test -f 'minilzo/testmini.c'; then $(CYGPATH_W) 'minilzo/testmini.c'; else $(CYGPATH_W) '$(srcdir)/minilzo/testmini.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minilzo/$(DEPDIR)/t-testmini.Tpo minilzo/$(DEPDIR)/t-testmini.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='minilzo/testmini.c' object='minilzo/t-testmini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minilzo/testmini.c' object='minilzo/t-testmini.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-testmini.obj `if test -f 'minilzo/testmini.c'; then $(CYGPATH_W) 'minilzo/testmini.c'; else $(CYGPATH_W) '$(srcdir)/minilzo/testmini.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-testmini.obj `if test -f 'minilzo/testmini.c'; then $(CYGPATH_W) 'minilzo/testmini.c'; else $(CYGPATH_W) '$(srcdir)/minilzo/testmini.c'; fi`
 
 minilzo/t-minilzo.o: minilzo/minilzo.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT minilzo/t-minilzo.o -MD -MP -MF minilzo/$(DEPDIR)/t-minilzo.Tpo -c -o minilzo/t-minilzo.o `test -f 'minilzo/minilzo.c' || echo '$(srcdir)/'`minilzo/minilzo.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minilzo/$(DEPDIR)/t-minilzo.Tpo minilzo/$(DEPDIR)/t-minilzo.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='minilzo/minilzo.c' object='minilzo/t-minilzo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minilzo/minilzo.c' object='minilzo/t-minilzo.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-minilzo.o `test -f 'minilzo/minilzo.c' || echo '$(srcdir)/'`minilzo/minilzo.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-minilzo.o `test -f 'minilzo/minilzo.c' || echo '$(srcdir)/'`minilzo/minilzo.c
 
 minilzo/t-minilzo.obj: minilzo/minilzo.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT minilzo/t-minilzo.obj -MD -MP -MF minilzo/$(DEPDIR)/t-minilzo.Tpo -c -o minilzo/t-minilzo.obj `if test -f 'minilzo/minilzo.c'; then $(CYGPATH_W) 'minilzo/minilzo.c'; else $(CYGPATH_W) '$(srcdir)/minilzo/minilzo.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minilzo/$(DEPDIR)/t-minilzo.Tpo minilzo/$(DEPDIR)/t-minilzo.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='minilzo/minilzo.c' object='minilzo/t-minilzo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minilzo/minilzo.c' object='minilzo/t-minilzo.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-minilzo.obj `if test -f 'minilzo/minilzo.c'; then $(CYGPATH_W) 'minilzo/minilzo.c'; else $(CYGPATH_W) '$(srcdir)/minilzo/minilzo.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilzo_testmini_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minilzo/t-minilzo.obj `if test -f 'minilzo/minilzo.c'; then $(CYGPATH_W) 'minilzo/minilzo.c'; else $(CYGPATH_W) '$(srcdir)/minilzo/minilzo.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1108,8 +1030,11 @@ distclean-libtool:
 	-rm -f libtool config.lt
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1123,13 +1048,14 @@ uninstall-docDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1143,30 +1069,17 @@ uninstall-pkgincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-
-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) config.hin $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.hin $(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; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1178,15 +1091,11 @@ TAGS:  $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.hin $(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; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1195,9 +1104,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -1243,36 +1174,42 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_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
@@ -1283,8 +1220,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1294,17 +1231,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1327,13 +1266,21 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1368,10 +1315,15 @@ install-am: all-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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1472,23 +1424,25 @@ uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \
 
 .MAKE: all check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am check-local \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-pkgincludeHEADERS 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 uninstall-docDATA uninstall-libLTLIBRARIES \
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \
+	check-local clean clean-cscope clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS cscope \
+	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-pkgincludeHEADERS 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 tags-am uninstall uninstall-am \
+	uninstall-docDATA uninstall-libLTLIBRARIES \
 	uninstall-pkgincludeHEADERS