From 98399ed51045871f8d73599322b6947d6b2b80d0 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 10 Aug 2015 13:51:40 +0200 Subject: Update lzo to 2.09 --- main/lzo/Makefile.in | 100 ++++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 44 deletions(-) (limited to 'main/lzo/Makefile.in') diff --git a/main/lzo/Makefile.in b/main/lzo/Makefile.in index 6b77e152..a88e6a81 100644 --- a/main/lzo/Makefile.in +++ b/main/lzo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ # # This file is part of the LZO data compression library. # -# Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer # All Rights Reserved. # @@ -27,7 +27,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -98,26 +108,13 @@ noinst_PROGRAMS = examples/dict$(EXEEXT) examples/lzopack$(EXEEXT) \ tests/chksum$(EXEEXT) tests/promote$(EXEEXT) \ tests/sizes$(EXEEXT) minilzo/testmini$(EXEEXT) subdir = . -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 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(pkginclude_HEADERS) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs @@ -325,6 +322,20 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.hin \ + $(top_srcdir)/autoconf/ar-lib $(top_srcdir)/autoconf/compile \ + $(top_srcdir)/autoconf/config.guess \ + $(top_srcdir)/autoconf/config.sub \ + $(top_srcdir)/autoconf/depcomp \ + $(top_srcdir)/autoconf/install-sh \ + $(top_srcdir)/autoconf/ltmain.sh \ + $(top_srcdir)/autoconf/missing \ + $(top_srcdir)/autoconf/mkinstalldirs AUTHORS COPYING ChangeLog \ + INSTALL NEWS README THANKS autoconf/ar-lib 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -464,19 +475,19 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = BUGS autoconf/shtool src/compr1b.h src/compr1c.h \ - src/config1.h src/config1a.h src/config1b.h src/config1c.h \ - src/config1f.h src/config1x.h src/config1y.h src/config1z.h \ - src/config2a.h src/lzo1_cm.ch src/lzo1_d.ch src/lzo1a_cm.ch \ - src/lzo1a_cr.ch src/lzo1a_de.h src/lzo1b_c.ch src/lzo1b_cc.h \ - src/lzo1b_cm.ch src/lzo1b_cr.ch src/lzo1b_d.ch src/lzo1b_de.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.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 \ +EXTRA_DIST = BUGS CMakeLists.txt autoconf/shtool src/compr1b.h \ + src/compr1c.h src/config1.h src/config1a.h src/config1b.h \ + src/config1c.h src/config1f.h src/config1x.h src/config1y.h \ + src/config1z.h src/config2a.h src/lzo1_cm.ch src/lzo1_d.ch \ + src/lzo1a_cm.ch src/lzo1a_cr.ch src/lzo1a_de.h src/lzo1b_c.ch \ + src/lzo1b_cc.h src/lzo1b_cm.ch src/lzo1b_cr.ch src/lzo1b_d.ch \ + src/lzo1b_de.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.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 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) LDADD = src/liblzo2.la @@ -566,7 +577,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1189,15 +1199,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @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 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives 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__post_remove_distdir) @@ -1233,17 +1243,17 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(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 \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1445,6 +1455,8 @@ uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \ uninstall-docDATA uninstall-libLTLIBRARIES \ uninstall-pkgincludeHEADERS +.PRECIOUS: Makefile + # hooks for Automake targets dist-hook: dist-hook-1 @@ -1455,7 +1467,7 @@ dist-hook-1: check-local: all-am ./lzotest/lzotest -mlzo -n2 -q $(top_srcdir)/COPYING @echo - @echo "All checks passed." + @echo "===== All checks passed. Type 'make test' for more exhaustive testing. =====" @echo # special targets @@ -1468,13 +1480,13 @@ basic-test: all test: all ./lzotest/lzotest -mavail -n10 -q $(top_srcdir)/COPYING - $(SHELL) -e $(top_srcdir)/util/check.sh $(top_srcdir) + LZOTEST=./lzotest/lzotest$(EXEEXT) $(SHELL) -e "$(top_srcdir)/util/check.sh" "$(top_srcdir)" ./tests/align ./tests/chksum ./examples/simple ./minilzo/testmini @echo - @echo "All tests passed. Now you are ready to install LZO." + @echo "===== All tests passed. Now you are ready to install LZO. =====" @echo @MAINT@-include $(top_srcdir)/Makefile.maint -- cgit v1.2.3