| Index: third_party/libxslt/src/Makefile.in
|
| diff --git a/third_party/libxslt/Makefile.in b/third_party/libxslt/src/Makefile.in
|
| similarity index 97%
|
| rename from third_party/libxslt/Makefile.in
|
| rename to third_party/libxslt/src/Makefile.in
|
| index 396f26c660c09c0ae868d76d90d176e549297108..5e272eb4e9446e2b53eb58678922a5d93275d682 100644
|
| --- a/third_party/libxslt/Makefile.in
|
| +++ b/third_party/libxslt/src/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,
|
| @@ -16,7 +16,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 \
|
| ?) ;; \
|
| @@ -80,17 +90,12 @@ POST_UNINSTALL = :
|
| build_triplet = @build@
|
| host_triplet = @host@
|
| subdir = .
|
| -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog COPYING \
|
| - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
| - $(top_srcdir)/configure $(am__configure_deps) \
|
| - $(srcdir)/config.h.in $(srcdir)/libxslt.pc.in \
|
| - $(srcdir)/libexslt.pc.in $(srcdir)/xslt-config.in \
|
| - $(srcdir)/libxslt.spec.in TODO compile config.guess config.sub \
|
| - install-sh missing ltmain.sh
|
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
| am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
| am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
| $(ACLOCAL_M4)
|
| +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
|
| + $(am__configure_deps) $(am__DIST_COMMON)
|
| am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
| configure.lineno config.status.lineno
|
| mkinstalldirs = $(install_sh) -d
|
| @@ -184,6 +189,11 @@ am__define_uniq_tagged_files = \
|
| ETAGS = etags
|
| CTAGS = ctags
|
| CSCOPE = cscope
|
| +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
| + $(srcdir)/libexslt.pc.in $(srcdir)/libxslt.pc.in \
|
| + $(srcdir)/libxslt.spec.in $(srcdir)/xslt-config.in AUTHORS \
|
| + COPYING ChangeLog INSTALL NEWS README TODO compile \
|
| + config.guess config.sub depcomp install-sh ltmain.sh missing
|
| DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
| distdir = $(PACKAGE)-$(VERSION)
|
| top_distdir = $(distdir)
|
| @@ -295,6 +305,7 @@ LIBXSLT_VERSION_NUMBER = @LIBXSLT_VERSION_NUMBER@
|
| LIPO = @LIPO@
|
| LN_S = @LN_S@
|
| LTLIBOBJS = @LTLIBOBJS@
|
| +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
| MAKEINFO = @MAKEINFO@
|
| MANIFEST_TOOL = @MANIFEST_TOOL@
|
| MKDIR_P = @MKDIR_P@
|
| @@ -446,7 +457,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
| 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*) \
|
| @@ -786,15 +796,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)
|
| @@ -830,17 +840,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 \
|
| @@ -1026,6 +1036,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-confexecDATA \
|
| uninstall-binSCRIPTS uninstall-confexecDATA \
|
| uninstall-m4dataDATA uninstall-pkgconfigDATA
|
|
|
| +.PRECIOUS: Makefile
|
| +
|
|
|
| dist-hook: cleanup libxslt.spec
|
| touch $(distdir)/doc/*.xml
|
|
|