gettext-0.19.7gettext-0.19.7

1 files changed, 93 insertions, 27 deletions

diff --git a/Makefile.in b/Makefile.in
index 36a6a4f..fb27a12 100644
--- a/Makefile.in
+++ b/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,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 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 \
       ?) ;; \
@@ -78,22 +88,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/build-aux/mkinstalldirs COPYING THANKS \
-	build-aux/compile build-aux/config.guess \
-	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
-	build-aux/install-sh build-aux/mdate-sh build-aux/missing \
-	build-aux/mkinstalldirs build-aux/texinfo.tex build-aux/ylwrap \
-	build-aux/ltmain.sh $(top_srcdir)/build-aux/config.guess \
-	$(top_srcdir)/build-aux/config.sub \
-	$(top_srcdir)/build-aux/install-sh \
-	$(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(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) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
@@ -158,6 +158,18 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/missing \
+	$(top_srcdir)/build-aux/mkinstalldirs AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README THANKS build-aux/ar-lib \
+	build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
+	build-aux/missing build-aux/mkinstalldirs \
+	build-aux/texinfo.tex build-aux/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -232,6 +244,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 PACKAGE = @PACKAGE@
@@ -287,6 +300,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -299,6 +313,35 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = gnulib-local gettext-runtime gettext-tools
+changelog_etc = \
+  gettext-runtime/ChangeLog.0 \
+  gettext-runtime/doc/ChangeLog.0 \
+  gettext-runtime/intl-csharp/ChangeLog.0 \
+  gettext-runtime/intl-java/ChangeLog.0 \
+  gettext-runtime/libasprintf/ChangeLog.0 \
+  gettext-runtime/m4/ChangeLog.0 \
+  gettext-runtime/man/ChangeLog.0 \
+  gettext-runtime/src/ChangeLog.0 \
+  gettext-runtime/tests/ChangeLog.0 \
+  gettext-tools/ChangeLog.0 \
+  gettext-tools/doc/ChangeLog.0 \
+  gettext-tools/doc/ChangeLog.1 \
+  gettext-tools/examples/ChangeLog.0 \
+  gettext-tools/gnulib-tests/ChangeLog.0 \
+  gettext-tools/libgettextpo/ChangeLog.0 \
+  gettext-tools/libgrep/ChangeLog.0 \
+  gettext-tools/m4/ChangeLog.0 \
+  gettext-tools/man/ChangeLog.0 \
+  gettext-tools/man/ChangeLog.1 \
+  gettext-tools/misc/ChangeLog.0 \
+  gettext-tools/projects/ChangeLog.0 \
+  gettext-tools/src/ChangeLog.0 \
+  gettext-tools/src/ChangeLog.1 \
+  gettext-tools/styles/ChangeLog.0 \
+  gettext-tools/tests/ChangeLog.0 \
+  gettext-tools/tests/ChangeLog.1 \
+  gnulib-local/ChangeLog.0
+
 
 # DJGPP port.
 
@@ -307,8 +350,8 @@ SUBDIRS = gnulib-local gettext-runtime gettext-tools
 # Woe32 support.
 
 # Versioning based on Git release tags.
-EXTRA_DIST = DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
-	build-aux/ac-help.sed build-aux/moopp \
+EXTRA_DIST = $(changelog_etc) DEPENDENCIES PACKAGING HACKING \
+	ChangeLog.0 autogen.sh build-aux/ac-help.sed build-aux/moopp \
 	build-aux/git-version-gen m4/fixautomake.m4 m4/woe32-dll.m4 \
 	m4/libtool.m4 djgpp/COPYING.DJ djgpp/Makefile.maint \
 	djgpp/README.DJ djgpp/README.in djgpp/README djgpp/config.bat \
@@ -320,6 +363,9 @@ EXTRA_DIST = DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
 	windows/windres-options windows/gettext.rc \
 	$(top_srcdir)/.version
 BUILT_SOURCES = $(top_srcdir)/.version
+
+# Generate ChangeLog.
+gen_start_date = 2015-10-13
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -339,7 +385,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*) \
@@ -548,15 +593,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)
@@ -592,18 +637,18 @@ 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-$$$$/" \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
 	  && 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 \
@@ -786,6 +831,8 @@ uninstall-am:
 	maintainer-update-po-local mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Additional dependencies for configure, due to the use of autoconf --trace.
 $(srcdir)/configure: $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-tools/configure.ac 
@@ -861,8 +908,27 @@ distcheck-hook:
 	test "`sed 1,15d gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d gettext-runtime/libasprintf/alloca.in.h | md5sum`"
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
+dist-hook: gen-ChangeLogs
 	echo $(VERSION) > $(distdir)/.tarball-version
+.PHONY: gen-ChangeLogs
+gen-ChangeLogs:
+	$(AM_V_GEN)if test -d .git; then				\
+	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
+	  test -e "$$log_fix"						\
+	    && amend_git_log="--amend=$$log_fix"			\
+	    || amend_git_log=;						\
+	  for d in . gettext-runtime/intl gettext-runtime/po		\
+		gettext-tools/po; do					\
+	    test "$$d" = "."						\
+	      && cldir="$(distdir)"					\
+	      || cldir="$(distdir)/$$d";				\
+	    $(top_srcdir)/build-aux/gitlog-to-changelog			\
+	      $$amend_git_log --since=$(gen_start_date) -- "$$d"	\
+		> "$$cldir/cl-t" &&					\
+	    { rm -f "$$cldir/ChangeLog" &&				\
+	      mv "$$cldir/cl-t" "$$cldir/ChangeLog"; };			\
+	  done;								\
+	fi
 
 # PO files update.