From 94e81d5582c92a4376744bc5e601f60773f63e71 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 24 Nov 2007 12:24:22 +0100 Subject: [PATCH] Ternary operator in lib/am files. * automake.in (&transform_token): New. (&transform): Use it. Support %KEY?TRUE:FALSE%. (&make_paragraphs): Adjust the regexp to call %transform. * lib/am/data.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am, * lib/am/progs.am, lib/am/python.am, lib/am/scripts.am: Use %KEY?TRUE:FALSE%. * lib/am/inst-vars.am (am__strip_dir): Assign the result to f to be more alike am__vpath_adj. Adjust dependencies. Signed-off-by: Akim Demaille --- ChangeLog | 14 +++++++++ automake.in | 79 ++++++++++++++++++++++++++++++++---------------- doc/Makefile.in | 22 +++++++------- lib/Automake/Makefile.in | 10 +++--- lib/Makefile.in | 10 +++--- lib/am/Makefile.in | 6 ++-- lib/am/data.am | 17 ++++------- lib/am/inst-vars.am | 4 +-- lib/am/libs.am | 16 +++++----- lib/am/lisp.am | 14 +++------ lib/am/ltlib.am | 19 +++++------- lib/am/progs.am | 6 ++-- lib/am/python.am | 20 +++++------- lib/am/scripts.am | 14 +++------ lib/am/texinfos.am | 16 +++++----- m4/Makefile.in | 6 ++-- 16 files changed, 144 insertions(+), 129 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fecbf8..a9c28e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-11-24 Akim Demaille + + Ternary operator in lib/am files. + * automake.in (&transform_token): New. + (&transform): Use it. + Support %KEY?TRUE:FALSE%. + (&make_paragraphs): Adjust the regexp to call %transform. + * lib/am/data.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am, + * lib/am/progs.am, lib/am/python.am, lib/am/scripts.am: + Use %KEY?TRUE:FALSE%. + * lib/am/inst-vars.am (am__strip_dir): Assign the result to f + to be more alike am__vpath_adj. + Adjust dependencies. + 2007-11-24 Akim Demaille * automake.in: Normalize white spaces. diff --git a/automake.in b/automake.in index 17d0241..efad0976 100755 --- a/automake.in +++ b/automake.in @@ -6399,39 +6399,63 @@ sub flatten return $_; } -# transform($TOKEN, \%PAIRS) -# ========================== + +# transform_token ($TOKEN, \%PAIRS, $KEY) +# ======================================= +# Return the value associated to $KEY in %PAIRS, as used on $TOKEN +# (which should be ?KEY? or any of the special %% requests).. +sub transform_token ($$$) +{ + my ($token, $transform, $key) = @_; + my $res = $transform->{$key}; + prog_error "Unknown key `$key' in `$token'" unless defined $res; + return $res; +} + + +# transform ($TOKEN, \%PAIRS) +# =========================== # If ($TOKEN, $VAL) is in %PAIRS: -# - replaces %$TOKEN% with $VAL, -# - enables/disables ?$TOKEN? and ?!$TOKEN?, -# - replaces %?$TOKEN% with TRUE or FALSE. -sub transform($$) +# - replaces %KEY% with $VAL, +# - enables/disables ?KEY? and ?!KEY?, +# - replaces %?KEY% with TRUE or FALSE. +# - replaces %KEY?IFTRUE%, %KEY:IFFALSE%, and %KEY?IFTRUE:IFFALSE% with +# IFTRUE / IFFALSE, as appropriate. +sub transform ($$) { my ($token, $transform) = @_; - if (substr ($token, 0, 1) eq '%') + # %KEY%. + # Must be before the following pattern to exclude the case + # when there is neither IFTRUE nor IFFALSE. + if ($token =~ /^%([\w\-]+)%$/) { - my $cond = (substr ($token, 1, 1) eq '?') ? 1 : 0; - $token = substr ($token, 1 + $cond, -1); - my $val = $transform->{$token}; - prog_error "Unknown %token% `$token'" unless defined $val; - if ($cond) - { - return $val ? 'TRUE' : 'FALSE'; - } - else - { - return $val; - } + return transform_token ($token, $transform, $1); + } + # %KEY?IFTRUE%, %KEY:IFFALSE%, and %KEY?IFTRUE:IFFALSE%. + elsif ($token =~ /^%([\w\-]+)(?:\?([^?:%]+))?(?::([^?:%]+))?%$/) + { + return transform_token ($token, $transform, $1) ? ($2 || '') : ($3 || ''); + } + # %?KEY%. + elsif ($token =~ /^%\?([\w\-]+)%$/) + { + return transform_token ($token, $transform, $1) ? 'TRUE' : 'FALSE'; + } + # ?KEY? and ?!KEY?. + elsif ($token =~ /^ \? (!?) ([\w\-]+) \? $/x) + { + my $neg = ($1 eq '!') ? 1 : 0; + my $val = transform_token ($token, $transform, $2); + return (!!$val == $neg) ? '##%' : ''; + } + else + { + prog_error "Unknown request format: $token"; } - # Now $token is '?xxx?' or '?!xxx?'. - my $neg = (substr ($token, 1, 1) eq '!') ? 1 : 0; - $token = substr ($token, 1 + $neg, -1); - my $val = $transform->{$token}; - prog_error "Unknown ?token? `$token' (neg = $neg)" unless defined $val; - return (!!$val == $neg) ? '##%' : ''; } + # @PARAGRAPHS # &make_paragraphs ($MAKEFILE, [%TRANSFORM]) # ------------------------------------------ @@ -6492,7 +6516,10 @@ sub make_paragraphs ($%) } # Substitute Automake template tokens. - s/(?:%\??[\w\-]+%|\?!?[\w\-]+\?)/transform($&, \%transform)/ge; + s/(?: % \?? [\w\-]+ % + | % [\w\-]+ (?:\?[^?:%]+)? (?::[^?:%]+)? % + | \? !? [\w\-]+ \? + )/transform($&, \%transform)/gex; # transform() may have added some ##%-comments to strip. # (we use `##%' instead of `##' so we can distinguish ##%##%##% from # ####### and do not remove the latter.) diff --git a/doc/Makefile.in b/doc/Makefile.in index 9b013f2..089cfb2 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -71,7 +71,7 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; dist_docDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_doc_DATA) $(dist_noinst_DATA) ETAGS = etags @@ -299,7 +299,7 @@ maintainer-clean-vti: uninstall-dvi-am: @$(NORMAL_UNINSTALL) @list='$(DVIS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ rm -f "$(DESTDIR)$(dvidir)/$$f"; \ done @@ -307,7 +307,7 @@ uninstall-dvi-am: uninstall-html-am: @$(NORMAL_UNINSTALL) @list='$(HTMLS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ done @@ -338,7 +338,7 @@ uninstall-info-am: uninstall-pdf-am: @$(NORMAL_UNINSTALL) @list='$(PDFS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ done @@ -346,7 +346,7 @@ uninstall-pdf-am: uninstall-ps-am: @$(NORMAL_UNINSTALL) @list='$(PSS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ rm -f "$(DESTDIR)$(psdir)/$$f"; \ done @@ -388,7 +388,7 @@ install-dist_docDATA: $(dist_doc_DATA) test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ done @@ -396,7 +396,7 @@ install-dist_docDATA: $(dist_doc_DATA) uninstall-dist_docDATA: @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ rm -f "$(DESTDIR)$(docdir)/$$f"; \ done @@ -537,7 +537,7 @@ install-dvi-am: $(DVIS) test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" @list='$(DVIS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \ done @@ -550,7 +550,7 @@ install-html-am: $(HTMLS) test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" @list='$(HTMLS)'; for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ if test -d "$$d$$p"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ @@ -602,7 +602,7 @@ install-pdf-am: $(PDFS) test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" @list='$(PDFS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ done @@ -613,7 +613,7 @@ install-ps-am: $(PSS) test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" @list='$(PSS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \ done diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 68a1246..9b49315 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -62,7 +62,7 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(perllibdir)" dist_perllibDATA_INSTALL = $(INSTALL_DATA) nodist_perllibDATA_INSTALL = $(INSTALL_DATA) @@ -232,7 +232,7 @@ install-dist_perllibDATA: $(dist_perllib_DATA) test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)" @list='$(dist_perllib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(dist_perllibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perllibdir)/$$f'"; \ $(dist_perllibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perllibdir)/$$f"; \ done @@ -240,7 +240,7 @@ install-dist_perllibDATA: $(dist_perllib_DATA) uninstall-dist_perllibDATA: @$(NORMAL_UNINSTALL) @list='$(dist_perllib_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(perllibdir)/$$f'"; \ rm -f "$(DESTDIR)$(perllibdir)/$$f"; \ done @@ -249,7 +249,7 @@ install-nodist_perllibDATA: $(nodist_perllib_DATA) test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)" @list='$(nodist_perllib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(nodist_perllibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perllibdir)/$$f'"; \ $(nodist_perllibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perllibdir)/$$f"; \ done @@ -257,7 +257,7 @@ install-nodist_perllibDATA: $(nodist_perllib_DATA) uninstall-nodist_perllibDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_perllib_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(perllibdir)/$$f'"; \ rm -f "$(DESTDIR)$(perllibdir)/$$f"; \ done diff --git a/lib/Makefile.in b/lib/Makefile.in index 741a132..199fe40 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -65,7 +65,7 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)" dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA) dist_scriptDATA_INSTALL = $(INSTALL_DATA) @@ -208,7 +208,7 @@ install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA) test -z "$(pkgvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgvdatadir)" @list='$(dist_pkgvdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(dist_pkgvdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgvdatadir)/$$f'"; \ $(dist_pkgvdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgvdatadir)/$$f"; \ done @@ -216,7 +216,7 @@ install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA) uninstall-dist_pkgvdataDATA: @$(NORMAL_UNINSTALL) @list='$(dist_pkgvdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgvdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgvdatadir)/$$f"; \ done @@ -225,7 +225,7 @@ install-dist_scriptDATA: $(dist_script_DATA) test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)" @list='$(dist_script_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(dist_scriptDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptdir)/$$f'"; \ $(dist_scriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptdir)/$$f"; \ done @@ -233,7 +233,7 @@ install-dist_scriptDATA: $(dist_script_DATA) uninstall-dist_scriptDATA: @$(NORMAL_UNINSTALL) @list='$(dist_script_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(scriptdir)/$$f'"; \ rm -f "$(DESTDIR)$(scriptdir)/$$f"; \ done diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index b90071b..5f837b2 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -55,7 +55,7 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(amdir)" dist_amDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_am_DATA) @@ -224,7 +224,7 @@ install-dist_amDATA: $(dist_am_DATA) test -z "$(amdir)" || $(MKDIR_P) "$(DESTDIR)$(amdir)" @list='$(dist_am_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(dist_amDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(amdir)/$$f'"; \ $(dist_amDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(amdir)/$$f"; \ done @@ -232,7 +232,7 @@ install-dist_amDATA: $(dist_am_DATA) uninstall-dist_amDATA: @$(NORMAL_UNINSTALL) @list='$(dist_am_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(amdir)/$$f'"; \ rm -f "$(DESTDIR)$(amdir)/$$f"; \ done diff --git a/lib/am/data.am b/lib/am/data.am index eea2ef2..25c6626 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006 +## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006, 2007 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -29,23 +29,20 @@ if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" ?BASE?%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%) ?!BASE?%DIR%%PRIMARY%_INSTALL = $(install_sh_DATA) -?EXEC?.PHONY install-exec-am: install-%DIR%%PRIMARY% -?!EXEC?.PHONY install-data-am: install-%DIR%%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) \ ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. -?!BASE? list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ + %BASE?@%list='$(%DIR%_%PRIMARY%)'; 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? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %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"; \ done @@ -61,10 +58,8 @@ if %?INSTALL% uninstall-%DIR%%PRIMARY%: @$(NORMAL_UNINSTALL) ?!BASE? @$(am__vpath_adj_setup) \ -?!BASE? list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ -?BASE? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?@%list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am index 7a58723..47f5014 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 Free Software Foundation, Inc. +## Copyright (C) 2004, 2007 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 @@ -26,5 +26,5 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; ## Strip all directories. -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; endif %?FIRST% diff --git a/lib/am/libs.am b/lib/am/libs.am index 505f7f8..d2f6389 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006 +## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -27,10 +27,8 @@ endif %?INSTALL% if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%LIBRARIES_INSTALL = $(INSTALL_DATA) -?!BASE?%DIR%LIBRARIES_INSTALL = $(install_sh_DATA) -?EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES -?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES +%DIR%LIBRARIES_INSTALL = %BASE?$(INSTALL_DATA):$(install_sh_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)" @@ -55,10 +53,10 @@ install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES) @$(POST_INSTALL) @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ -?BASE? p=$(am__strip_dir) \ +?BASE? $(am__strip_dir) \ ## Must ranlib after installing because mod time changes. - echo " $(RANLIB) '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ - $(RANLIB) "$(DESTDIR)$(%NDIR%dir)/$$p"; \ + echo " $(RANLIB) '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ + $(RANLIB) "$(DESTDIR)$(%NDIR%dir)/$$f"; \ else :; fi; \ done endif %?INSTALL% @@ -73,7 +71,7 @@ if %?INSTALL% uninstall-%DIR%LIBRARIES: @$(NORMAL_UNINSTALL) @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ -?BASE? p=$(am__strip_dir) \ +?BASE? $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ done diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 715412e..2c39b6e 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -82,10 +82,8 @@ $(am__ELCFILES): elc-stamp if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%LISP_INSTALL = $(INSTALL_DATA) -?!BASE?%DIR%LISP_INSTALL = $(install_sh_DATA) -?EXEC?.PHONY install-exec-am: install-%DIR%LISP -?!EXEC?.PHONY install-data-am: install-%DIR%LISP +%DIR%LISP_INSTALL = %BASE?$(INSTALL_DATA):$(install_sh_DATA)% +.PHONY install-%EXEC?exec:data%-am: install-%DIR%LISP install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) @$(NORMAL_INSTALL) ## Do not install anything if EMACS was not found. @@ -97,8 +95,7 @@ install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) list='$(%DIR%_LISP)'; for p in $$list; do \ ## A lisp file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -?BASE? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ echo " $(%DIR%LISP_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ $(%DIR%LISP_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ ## Only install .elc file if it exists. @@ -123,8 +120,7 @@ uninstall-%DIR%LISP: @if test "$(EMACS)" != no; then \ ?!BASE? $(am__vpath_adj_setup) \ list='$(%DIR%_LISP)'; for p in $$list; do \ -?BASE? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f' '$(DESTDIR)$(%NDIR%dir)/$${f}c'"; \ rm -f "$(DESTDIR)$(%NDIR%dir)/$$f" "$(DESTDIR)$(%NDIR%dir)/$${f}c"; \ done; \ diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index e440772..d4781df 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -27,10 +27,8 @@ endif %?INSTALL% if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%LTLIBRARIES_INSTALL = $(INSTALL) -?!BASE?%DIR%LTLIBRARIES_INSTALL = $(install_sh) -c -?EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES -?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES +%DIR%LTLIBRARIES_INSTALL = %BASE?$(INSTALL):$(install_sh) -c% +.PHONY install-%EXEC?exec:data%-am: install-%DIR%LTLIBRARIES install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" @@ -41,8 +39,7 @@ install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES) ## 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? f=$(am__strip_dir) \ -?!BASE? f=$$p; \ + %BASE?$(am__strip_dir):f=$$p%; \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. ## Use INSTALL and not INSTALL_DATA because libtool knows the right @@ -65,11 +62,11 @@ if %?INSTALL% uninstall-%DIR%LTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \ -?BASE? p=$(am__strip_dir) \ -?LIBTOOL? echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ -?LIBTOOL? $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ -?!LIBTOOL? echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \ -?!LIBTOOL? rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \ +?BASE? $(am__strip_dir) \ +?LIBTOOL? echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ +?LIBTOOL? $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ +?!LIBTOOL? echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ +?!LIBTOOL? rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done endif %?INSTALL% diff --git a/lib/am/progs.am b/lib/am/progs.am index 98662fe..c721b42 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -24,10 +24,8 @@ if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%PROGRAMS_INSTALL = $(INSTALL_PROGRAM) -?!BASE?%DIR%PROGRAMS_INSTALL = $(install_sh_PROGRAM) -?EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS -?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS +%DIR%PROGRAMS_INSTALL = %BASE?$(INSTALL_PROGRAM):$(install_sh_PROGRAM)% +.PHONY install-%EXEC?exec:data%-am: install-%DIR%PROGRAMS install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" diff --git a/lib/am/python.am b/lib/am/python.am index a55f319..9141a9e 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1999, 2001, 2003, 2004, 2006 Free Software Foundation, Inc. +## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007 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 @@ -26,24 +26,20 @@ endif %?INSTALL% if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%PYTHON_INSTALL = $(INSTALL_DATA) -?!BASE?%DIR%PYTHON_INSTALL = $(install_sh_DATA) -?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON -?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON +%DIR%PYTHON_INSTALL = %BASE?$(INSTALL_DATA):$(install_sh_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) \ -?!BASE? list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\ -?BASE? @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\ + %BASE?@%list='$(%DIR%_PYTHON)'; dlist=''; 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? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ dlist="$$dlist $$f"; \ ## Don't perform translation, since script name is important. echo " $(%DIR%PYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ @@ -71,10 +67,8 @@ if %?INSTALL% uninstall-%DIR%PYTHON: @$(NORMAL_UNINSTALL) ?!BASE? @$(am__vpath_adj_setup) \ -?!BASE? list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\ -?BASE? @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\ -?BASE? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?@%list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ ## This is to remove the .pyc and .pyo byte compiled versions (a bit ## of a hack). diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 0e11c80..a2ab18f 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006 +## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006, 2007 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -30,18 +30,15 @@ endif %?INSTALL% if %?INSTALL% ## if doesn't work properly for Automake variables yet. am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%SCRIPT_INSTALL = $(INSTALL_SCRIPT) -?!BASE?%DIR%SCRIPT_INSTALL = $(install_sh_SCRIPT) -?EXEC?.PHONY install-exec-am: install-%DIR%SCRIPTS -?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS +%DIR%SCRIPT_INSTALL = %BASE?$(INSTALL_SCRIPT):$(install_sh_SCRIPT)% +.PHONY install-%EXEC?exec:data%-am: install-%DIR%SCRIPTS install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" ?!BASE? @$(am__vpath_adj_setup) \ ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. -?!BASE? list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ + %BASE?@%list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ ?!BASE? $(am__vpath_adj) p=$$f; \ ## A file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -70,8 +67,7 @@ if %?INSTALL% uninstall-%DIR%SCRIPTS: @$(NORMAL_UNINSTALL) ?!BASE? @$(am__vpath_adj_setup) \ -?!BASE? list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ + %BASE?@%list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ ?!BASE? $(am__vpath_adj) p=$$f; \ ## Remove any leading directory before applying $(transform). f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index c905aab..0d0053a 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -148,7 +148,7 @@ install-dvi-am: $(DVIS) test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" @list='$(DVIS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \ done @@ -158,7 +158,7 @@ install-html-am: $(HTMLS) test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" @list='$(HTMLS)'; for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ if test -d "$$d$$p"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ @@ -235,7 +235,7 @@ install-pdf-am: $(PDFS) test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" @list='$(PDFS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ done @@ -245,7 +245,7 @@ install-ps-am: $(PSS) test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" @list='$(PSS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \ done @@ -274,7 +274,7 @@ if %?LOCAL-TEXIS% uninstall-dvi-am: @$(NORMAL_UNINSTALL) @list='$(DVIS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ rm -f "$(DESTDIR)$(dvidir)/$$f"; \ done @@ -282,7 +282,7 @@ uninstall-dvi-am: uninstall-html-am: @$(NORMAL_UNINSTALL) @list='$(HTMLS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ ## $f can be a directory, hence the -r. echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ @@ -319,7 +319,7 @@ uninstall-info-am: uninstall-pdf-am: @$(NORMAL_UNINSTALL) @list='$(PDFS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ done @@ -327,7 +327,7 @@ uninstall-pdf-am: uninstall-ps-am: @$(NORMAL_UNINSTALL) @list='$(PSS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ rm -f "$(DESTDIR)$(psdir)/$$f"; \ done diff --git a/m4/Makefile.in b/m4/Makefile.in index 3864844..bc97521 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -55,7 +55,7 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(m4datadir)" dist_m4dataDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_m4data_DATA) @@ -220,7 +220,7 @@ install-dist_m4dataDATA: $(dist_m4data_DATA) test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" @list='$(dist_m4data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " $(dist_m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ $(dist_m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ done @@ -228,7 +228,7 @@ install-dist_m4dataDATA: $(dist_m4data_DATA) uninstall-dist_m4dataDATA: @$(NORMAL_UNINSTALL) @list='$(dist_m4data_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ done -- 2.7.4