[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-133-g2139f25 |
|
Date: |
Sat, 08 Mar 2008 13:09:03 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=2139f25bdab938fa648d8f54250eb99bc66a0a86
The branch, master has been updated
via 2139f25bdab938fa648d8f54250eb99bc66a0a86 (commit)
from 8aad9804d86190b47c745c3f39df8f1810f55ef6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2139f25bdab938fa648d8f54250eb99bc66a0a86
Author: Ralf Wildenhues <address@hidden>
Date: Sat Mar 8 13:58:18 2008 +0100
Exploit `install' with multiple files at once for some file types.
With nobase targets, at most 50 files are installed at once,
to avoid quadratic string concatenation and line length limits.
This isn't yet done with base targets. One hope is that there,
the typical file name length is lower. If this turns out to be
a problem, it should be revisited.
* lib/am/inst-vars.am (am__nobase_list): New helper macro for
installation of multiple nobase files at once: sorts and lists
files keyed by their target directory.
* lib/am/data.am (%DIR%%PRIMARY%_INSTALL): No need to set it to
$(install_sh_DATA) any more, not even for nobase targets.
(install-%DIR%%PRIMARY%): Split base and nobase cases.
Rewrite to pass lists of files which all go in the same
directory to `install'. In the nobase case, make use of
$(am__nobase_list) and $(MKDIR_P) each directory before
populating it. Take care of files in source and build trees,
and avoid creating directories where no files are to be
installed.
* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Likewise.
(install-%DIR%LIBRARIES): Likewise.
* lib/am/python.am (%DIR%PYTHON_INSTALL): Likewise.
(install-%DIR%PYTHON): Likewise. Also take care to keep note of
a list for byte compilation after installation.
* lib/am/texinfos.am (install-dvi-am, install-html-am)
(install-info-am, install-pdf-am, install-ps-am): Use file lists
to install multiple files at once.
* NEWS: Update.
Suggested by Akim Demaille.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 32 ++++++++++++++++++++
NEWS | 7 ++++
doc/Makefile.in | 72 +++++++++++++++++++++++++++------------------
lib/Automake/Makefile.in | 29 ++++++++++++------
lib/Makefile.in | 29 ++++++++++++------
lib/am/Makefile.in | 18 ++++++++---
lib/am/data.am | 32 ++++++++++++++------
lib/am/inst-vars.am | 16 +++++++++-
lib/am/libs.am | 34 +++++++++++++++------
lib/am/python.am | 45 +++++++++++++++++++++++-----
lib/am/texinfos.am | 57 ++++++++++++++++++++----------------
m4/Makefile.in | 18 ++++++++---
12 files changed, 276 insertions(+), 113 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3899503..c22e6b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
2008-03-08 Ralf Wildenhues <address@hidden>
+ Use `install' with multiple files at once for some primaries.
+ With nobase targets, at most 50 files are installed at once,
+ to avoid quadratic string concatenation and line length limits.
+ This isn't yet done with base targets. One hope is that there,
+ the typical file name length is lower. If this turns out to be
+ a problem, it should be revisited.
+
+ * lib/am/inst-vars.am (am__nobase_list): New helper macro for
+ installation of multiple nobase files at once: sorts and lists
+ files keyed by their target directory.
+ * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): No need to set it to
+ $(install_sh_DATA) any more, not even for nobase targets.
+ (install-%DIR%%PRIMARY%): Split base and nobase cases.
+ Rewrite to pass lists of files which all go in the same
+ directory to `install'. In the nobase case, make use of
+ $(am__nobase_list) and $(MKDIR_P) each directory before
+ populating it. Take care of files in source and build trees,
+ and avoid creating directories where no files are to be
+ installed.
+ * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Likewise.
+ (install-%DIR%LIBRARIES): Likewise.
+ * lib/am/python.am (%DIR%PYTHON_INSTALL): Likewise.
+ (install-%DIR%PYTHON): Likewise. Also take care to keep note of
+ a list for byte compilation after installation.
+ * lib/am/texinfos.am (install-dvi-am, install-html-am)
+ (install-info-am, install-pdf-am, install-ps-am): Use file lists
+ to install multiple files at once.
+ * NEWS: Update.
+ Suggested by Akim Demaille.
+
+2008-03-08 Ralf Wildenhues <address@hidden>
+
Require unreleased Autoconf for fixed AC_PROG_INSTALL.
* m4/init.m4 (AM_INIT_AUTOMAKE): Bump AC_PREREQ to 2.61-341,
regenerate files.
diff --git a/NEWS b/NEWS
index 88437cf..3856d03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
New in 1.10a:
+* Version requirements:
+
+ - Autoconf 2.61a-341 or greater is required.
+
* Changes to aclocal:
- The autoconf version check implemented by aclocal in aclocal.m4
@@ -44,6 +48,9 @@ New in 1.10a:
- install-sh supports -C, which does not update the installed file
(and its time stamps) if the contents did not change.
+ - `make install' now installs multiple files in one `install' invocation
+ for files with DATA, HEADERS, PYTHON, LIBRARIES and TEXINFOS primaries.
+
- The "deleted header file problem" for *.m4 files is avoided by
stub rules. This allows `make' to trigger a rerun of `aclocal'
also if some previously needed macro file has been removed.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 25908ea..5f5dc8e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -72,6 +72,13 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__nobase_list = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == 50) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" }
} \
+ END { for (dir in files) print dir " " files[dir] }'
dist_docDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_doc_DATA) $(dist_noinst_DATA)
ETAGS = etags
@@ -387,12 +394,13 @@ maintainer-clean-aminfo:
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
- @list='$(dist_doc_DATA)'; for p in $$list; do \
+ @list='$(dist_doc_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(dist_docDATA_INSTALL) $$list2 '$(DESTDIR)$(docdir)'"; \
+ $(dist_docDATA_INSTALL) $$list2 "$(DESTDIR)$(docdir)"; }
uninstall-dist_docDATA:
@$(NORMAL_UNINSTALL)
@@ -541,12 +549,13 @@ install-dvi: install-dvi-am
install-dvi-am: $(DVIS)
@$(NORMAL_INSTALL)
test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
- @list='$(DVIS)'; for p in $$list; do \
+ @list='$(DVIS)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(dvidir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(dvidir)"; }
install-exec-am:
install-html: install-html-am
@@ -554,7 +563,7 @@ install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
+ @list='$(HTMLS)'; list2=; for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__strip_dir) \
if test -d "$$d$$p"; then \
@@ -563,17 +572,19 @@ install-html-am: $(HTMLS)
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
else \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ list2="$$list2 $$d$$p"; \
fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(htmldir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(htmldir)"; }
install-info: install-info-am
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; \
+ list='$(INFO_DEPS)'; list2=; \
for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -583,12 +594,13 @@ install-info-am: $(INFO_DEPS)
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
$$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
if test -f $$ifile; then \
- relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
- echo " $(INSTALL_DATA) '$$ifile'
'$(DESTDIR)$(infodir)/$$relfile'"; \
- $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
+ list2="$$list2 $$ifile"; \
else : ; fi; \
done; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(infodir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(infodir)"; }
@$(POST_INSTALL)
@if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian)
>/dev/null 2>&1; then \
@@ -606,23 +618,25 @@ install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
+ @list='$(PDFS)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(pdfdir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(pdfdir)"; }
install-ps: install-ps-am
install-ps-am: $(PSS)
@$(NORMAL_INSTALL)
test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
- @list='$(PSS)'; for p in $$list; do \
+ @list='$(PSS)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(psdir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(psdir)"; }
installcheck-am:
maintainer-clean: maintainer-clean-am
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index f6d8e7d..088a405 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -63,6 +63,13 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__nobase_list = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == 50) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" }
} \
+ END { for (dir in files) print dir " " files[dir] }'
am__installdirs = "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(perllibdir)"
dist_perllibDATA_INSTALL = $(INSTALL_DATA)
nodist_perllibDATA_INSTALL = $(INSTALL_DATA)
@@ -256,12 +263,13 @@ $(am__aclocal_m4_deps):
install-dist_perllibDATA: $(dist_perllib_DATA)
@$(NORMAL_INSTALL)
test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
- @list='$(dist_perllib_DATA)'; for p in $$list; do \
+ @list='$(dist_perllib_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(dist_perllibDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(perllibdir)/$$f'"; \
- $(dist_perllibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perllibdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(dist_perllibDATA_INSTALL) $$list2
'$(DESTDIR)$(perllibdir)'"; \
+ $(dist_perllibDATA_INSTALL) $$list2 "$(DESTDIR)$(perllibdir)"; }
uninstall-dist_perllibDATA:
@$(NORMAL_UNINSTALL)
@@ -273,12 +281,13 @@ uninstall-dist_perllibDATA:
install-nodist_perllibDATA: $(nodist_perllib_DATA)
@$(NORMAL_INSTALL)
test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
- @list='$(nodist_perllib_DATA)'; for p in $$list; do \
+ @list='$(nodist_perllib_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(nodist_perllibDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(perllibdir)/$$f'"; \
- $(nodist_perllibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perllibdir)/$$f";
\
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(nodist_perllibDATA_INSTALL) $$list2
'$(DESTDIR)$(perllibdir)'"; \
+ $(nodist_perllibDATA_INSTALL) $$list2 "$(DESTDIR)$(perllibdir)"; }
uninstall-nodist_perllibDATA:
@$(NORMAL_UNINSTALL)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 97362be..2cb7cdc 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -66,6 +66,13 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__nobase_list = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == 50) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" }
} \
+ END { for (dir in files) print dir " " files[dir] }'
am__installdirs = "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)"
dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA)
dist_scriptDATA_INSTALL = $(INSTALL_DATA)
@@ -232,12 +239,13 @@ $(am__aclocal_m4_deps):
install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgvdatadir)"
- @list='$(dist_pkgvdata_DATA)'; for p in $$list; do \
+ @list='$(dist_pkgvdata_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(dist_pkgvdataDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgvdatadir)/$$f'"; \
- $(dist_pkgvdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgvdatadir)/$$f";
\
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(dist_pkgvdataDATA_INSTALL) $$list2
'$(DESTDIR)$(pkgvdatadir)'"; \
+ $(dist_pkgvdataDATA_INSTALL) $$list2 "$(DESTDIR)$(pkgvdatadir)"; }
uninstall-dist_pkgvdataDATA:
@$(NORMAL_UNINSTALL)
@@ -249,12 +257,13 @@ uninstall-dist_pkgvdataDATA:
install-dist_scriptDATA: $(dist_script_DATA)
@$(NORMAL_INSTALL)
test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
- @list='$(dist_script_DATA)'; for p in $$list; do \
+ @list='$(dist_script_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(dist_scriptDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(scriptdir)/$$f'"; \
- $(dist_scriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(dist_scriptDATA_INSTALL) $$list2 '$(DESTDIR)$(scriptdir)'"; \
+ $(dist_scriptDATA_INSTALL) $$list2 "$(DESTDIR)$(scriptdir)"; }
uninstall-dist_scriptDATA:
@$(NORMAL_UNINSTALL)
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 8fc1059..c3366b3 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -56,6 +56,13 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__nobase_list = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == 50) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" }
} \
+ END { for (dir in files) print dir " " files[dir] }'
am__installdirs = "$(DESTDIR)$(amdir)"
dist_amDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_am_DATA)
@@ -223,12 +230,13 @@ $(am__aclocal_m4_deps):
install-dist_amDATA: $(dist_am_DATA)
@$(NORMAL_INSTALL)
test -z "$(amdir)" || $(MKDIR_P) "$(DESTDIR)$(amdir)"
- @list='$(dist_am_DATA)'; for p in $$list; do \
+ @list='$(dist_am_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(dist_amDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(amdir)/$$f'"; \
- $(dist_amDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(amdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(dist_amDATA_INSTALL) $$list2 '$(DESTDIR)$(amdir)'"; \
+ $(dist_amDATA_INSTALL) $$list2 "$(DESTDIR)$(amdir)"; }
uninstall-dist_amDATA:
@$(NORMAL_UNINSTALL)
diff --git a/lib/am/data.am b/lib/am/data.am
index 33b0613..627301b 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006, 2007
-## Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006,
+## 2007, 2008 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -25,25 +25,39 @@ endif %?INSTALL%
if %?INSTALL%
am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-?BASE?%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%)
-?!BASE?%DIR%%PRIMARY%_INSTALL = $(install_sh_DATA)
+%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%)
.PHONY install-%EXEC?exec:data%-am: install-%DIR%%PRIMARY%
install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
@$(NORMAL_INSTALL)
test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
-?!BASE? @$(am__vpath_adj_setup) \
+if %?BASE%
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
- address@hidden'$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+ @list='$(%DIR%_%PRIMARY%)'; list2=; for p in $$list; do \
## A file can be in the source directory or the build directory.
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
## If the _%PRIMARY% variable has an entry like foo/bar, install it as
## $(destdir)/bar, not $(destdir)/foo/bar. The user can make a
## new dir variable or use a nobase_ target for the latter case.
- %BASE?$(am__strip_dir):$(am__vpath_adj)% \
- echo " $(%DIR%%PRIMARY%_INSTALL) '$$d$$p'
'$(DESTDIR)$(%NDIR%dir)/$$f'"; \
- $(%DIR%%PRIMARY%_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(%DIR%%PRIMARY%_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
+ $(%DIR%%PRIMARY%_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)"; }
+else !%?BASE%
+ @list='$(%DIR%_%PRIMARY%)'; $(am__nobase_list) | \
+ while read dir files; do \
+ xfiles=; for file in $$files; do \
+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
+ echo " $(%DIR%%PRIMARY%_INSTALL) $$xfiles
'$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+ $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir";
}; \
done
+endif !%?BASE%
endif %?INSTALL%
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index 7ddf850..acdfc9a 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+## Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -25,4 +25,18 @@ am__vpath_adj = case $$p in \
esac;
## Strip all directories.
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+## Take a $list of nobase files, collect them, indexed by their
+## srcdir-stripped dirnames. For up to 50 files, output a line
+## containing the dirname and the files, space-separated.
+## The arbitrary limit helps avoid the quadratic scaling exhibited by
+## string concatenation in most shells, and should avoid line length
+## limitations, while still offering only negligible performance impact
+## through spawning more install commands than absolutely needed.
+am__nobase_list = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == 50) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" }
} \
+ END { for (dir in files) print dir " " files[dir] }'
endif %?FIRST%
diff --git a/lib/am/libs.am b/lib/am/libs.am
index aecee2b..18d9642 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
2007
-## Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
+## 2007, 2008 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -25,23 +25,37 @@ endif %?INSTALL%
if %?INSTALL%
am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%LIBRARIES_INSTALL = %BASE?$(INSTALL_DATA):$(install_sh_DATA)%
+%DIR%LIBRARIES_INSTALL = $(INSTALL_DATA)
.PHONY install-%EXEC?exec:data%-am: install-%DIR%LIBRARIES
install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
+if %?BASE%
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
- @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+ @list='$(%DIR%_LIBRARIES)'; list2=; for p in $$list; do \
if test -f $$p; then \
-## Compute basename of source file. Unless this is a nobase_ target, we
-## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.yo',
-## not '$(DESTDIR)$(%NDIR%dir)/python/foo.yo'.
- %BASE?$(am__strip_dir):f=$$p;% \
- echo " $(%DIR%LIBRARIES_INSTALL) '$$p'
'$(DESTDIR)$(%NDIR%dir)/$$f'"; \
- $(%DIR%LIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(%DIR%LIBRARIES_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
+ $(%DIR%LIBRARIES_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)"; }
+else !%?BASE%
+## Funny invocation because Makefile variable can be empty, leading to
+## a syntax error in sh.
+ @list='$(%DIR%_LIBRARIES)'; $(am__nobase_list) | \
+ while read dir files; do \
+ xfiles=; for p in $$files; do \
+ if test -f "$$p"; then xfiles="$$xfiles $$p"; else :; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
+ echo " $(%DIR%%PRIMARY%_INSTALL) $$xfiles
'$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+ $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir";
}; \
done
+endif !%?BASE%
## We do two loops here so that $(POST_INSTALL) can be empty. If we
## merge the two loops, we get a syntax error from sh. Anyway, having
## $(POST_INSTALL) in the middle of the loop essentially renders it
diff --git a/lib/am/python.am b/lib/am/python.am
index 2140dd2..2c02275 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -1,5 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007 Free Software Foundation,
Inc.
+## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007, 2008 Free Software
+## Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -24,26 +25,28 @@ endif %?INSTALL%
if %?INSTALL%
am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%PYTHON_INSTALL = %BASE?$(INSTALL_DATA):$(install_sh_DATA)%
+%DIR%PYTHON_INSTALL = $(INSTALL_DATA)
.PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON
install-%DIR%PYTHON: $(%DIR%_PYTHON)
@$(NORMAL_INSTALL)
test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
-?!BASE? @$(am__vpath_adj_setup) \
- address@hidden'$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+if %?BASE%
+ @list='$(%DIR%_PYTHON)'; dlist=''; list2=''; for p in $$list; do\
## A file can be in the source directory or the build directory.
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
## Compute basename of source file. Unless this is a nobase_ target, we
## want to install 'python/foo.py' as '$(DESTDIR)$(%NDIR%dir)/foo.py',
## not '$(DESTDIR)$(%NDIR%dir)/python/foo.py'.
- %BASE?$(am__strip_dir):$(am__vpath_adj)% \
+ $(am__strip_dir) \
dlist="$$dlist $$f"; \
-## Don't perform translation, since script name is important.
- echo " $(%DIR%PYTHON_INSTALL) '$$b$$p'
'$(DESTDIR)$(%NDIR%dir)/$$f'"; \
- $(%DIR%PYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
+ list2="$$list2 $$b$$p"; \
else :; fi; \
done; \
+ test -z "$$list2" || { \
+## Don't perform translation, since script name is important.
+ echo " $(%DIR%PYTHON_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
+ $(%DIR%PYTHON_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)"; }; \
## Byte-compile must be done at install time, since file times are
## encoded in the actual files.
if test -n "$$dlist"; then \
@@ -53,6 +56,32 @@ install-%DIR%PYTHON: $(%DIR%_PYTHON)
PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir
"$(%NDIR%dir)" $$dlist; \
fi; \
else :; fi
+else !%?BASE%
+ @list='$(%DIR%_PYTHON)'; $(am__nobase_list) | \
+ while read dir files; do \
+ xfiles=; for p in $$files; do \
+## A file can be in the source directory or the build directory.
+ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
+ if test -f "$$b$$p"; then xfiles="$$xfiles $$b$$p"; dlist="$$dlist
$$p"; \
+ else :; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
+## Don't perform translation, since script name is important.
+ echo " $(%DIR%PYTHON_INSTALL) $$xfiles
'$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+ $(%DIR%PYTHON_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
+## Byte-compile must be done at install time, since file times are
+## encoded in the actual files.
+ if test -n "$$dlist"; then \
+ if test -z "$(DESTDIR)"; then \
+ PYTHON=$(PYTHON) $(py_compile) --basedir "$(%NDIR%dir)" $$dlist; \
+ else \
+ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir
"$(%NDIR%dir)" $$dlist; \
+ fi; \
+ else :; fi \
+ done
+endif !%?BASE%
endif %?INSTALL%
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 8bf594c..6bd65af 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,7 +1,7 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+## 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -144,17 +144,18 @@ include inst-vars.am
install-dvi-am: $(DVIS)
@$(NORMAL_INSTALL)
test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
- @list='$(DVIS)'; for p in $$list; do \
+ @list='$(DVIS)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(dvidir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(dvidir)"; }
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
+ @list='$(HTMLS)'; list2=; for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__strip_dir) \
if test -d "$$d$$p"; then \
@@ -163,16 +164,18 @@ install-html-am: $(HTMLS)
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
else \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ list2="$$list2 $$d$$p"; \
fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(htmldir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(htmldir)"; }
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; \
+ list='$(INFO_DEPS)'; list2=; \
for file in $$list; do \
## Strip possible $(srcdir) prefix.
case $$file in \
@@ -192,13 +195,13 @@ install-info-am: $(INFO_DEPS)
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
$$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
if test -f $$ifile; then \
-## Strip directory
- relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
- echo " $(INSTALL_DATA) '$$ifile'
'$(DESTDIR)$(infodir)/$$relfile'"; \
- $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
+ list2="$$list2 $$ifile"; \
else : ; fi; \
done; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(infodir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(infodir)"; }
@$(POST_INSTALL)
## Only run this code if install-info actually exists, and it is not
## the Debian install-info. FIXME: once Debian install-info goes
@@ -231,22 +234,24 @@ install-info-am: $(INFO_DEPS)
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
+ @list='$(PDFS)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(pdfdir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(pdfdir)"; }
install-ps-am: $(PSS)
@$(NORMAL_INSTALL)
test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
- @list='$(PSS)'; for p in $$list; do \
+ @list='$(PSS)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(psdir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(psdir)"; }
else ! %?LOCAL-TEXIS%
install-dvi-am:
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 4e1bc18..762a891 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -56,6 +56,13 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__nobase_list = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == 50) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" }
} \
+ END { for (dir in files) print dir " " files[dir] }'
am__installdirs = "$(DESTDIR)$(m4datadir)"
dist_m4dataDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_m4data_DATA)
@@ -219,12 +226,13 @@ $(am__aclocal_m4_deps):
install-dist_m4dataDATA: $(dist_m4data_DATA)
@$(NORMAL_INSTALL)
test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)"
- @list='$(dist_m4data_DATA)'; for p in $$list; do \
+ @list='$(dist_m4data_DATA)'; list2=; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- $(am__strip_dir) \
- echo " $(dist_m4dataDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(m4datadir)/$$f'"; \
- $(dist_m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
- done
+ list2="$$list2 $$d$$p"; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(dist_m4dataDATA_INSTALL) $$list2 '$(DESTDIR)$(m4datadir)'"; \
+ $(dist_m4dataDATA_INSTALL) $$list2 "$(DESTDIR)$(m4datadir)"; }
uninstall-dist_m4dataDATA:
@$(NORMAL_UNINSTALL)
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-133-g2139f25,
Ralf Wildenhues <=