From: Stefano Lattarini Date: Thu, 9 Aug 2012 16:45:46 +0000 (+0200) Subject: [ng] rename: am__tagged_files -> am.tags.files X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae42495f26be734e826a0d10fd7b6156c23d256e;p=thirdparty%2Fautomake.git [ng] rename: am__tagged_files -> am.tags.files Signed-off-by: Stefano Lattarini --- diff --git a/automake.in b/automake.in index f7bfea379..3a9cca33f 100644 --- a/automake.in +++ b/automake.in @@ -3150,11 +3150,11 @@ sub handle_data # Handle TAGS. sub handle_tags { - define_variable ('am__tagged_files', INTERNAL, + define_variable ('am.tags.files', INTERNAL, qw/$(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) $(am.config-hdr.local.in)/); - if (rvar('am__tagged_files')->value_as_list_recursive + if (rvar('am.tags.files')->value_as_list_recursive || var ('ETAGS_ARGS') || var ('SUBDIRS')) { $output_rules .= &file_contents ('tags', new Automake::Location); diff --git a/lib/am/tags.am b/lib/am/tags.am index c2887d8f6..368911d7f 100644 --- a/lib/am/tags.am +++ b/lib/am/tags.am @@ -27,7 +27,7 @@ am__uniquify_input = $(AWK) '\ # e.g., the same source file might be shared among _SOURCES variables # for different programs/libraries. am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ + list='$(am.tags.files)'; \ unique=`for i in $$list; do \ ## Handle VPATH correctly. if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -37,7 +37,7 @@ am__define_uniq_tagged_files = \ ## ID. ## ## ---- ## -ID: $(am__tagged_files) +ID: $(am.tags.files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -56,7 +56,7 @@ tags: tags-am endif !%?SUBDIRS% TAGS: tags -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +tags-am: $(TAGS_DEPENDENCIES) $(am.tags.files) ## We use the positional parameters to build the subdir list with ## absolute names, without the need to worry about white space in `pwd`. set x; \ @@ -112,7 +112,7 @@ ctags: ctags-am endif !%?SUBDIRS% CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +ctags-am: $(TAGS_DEPENDENCIES) $(am.tags.files) $(am__define_uniq_tagged_files); \ ## Make sure we have something to run ctags on. test -z "$(CTAGS_ARGS)$$unique" \ @@ -154,8 +154,8 @@ else !%?SUBDIRS% cscopelist: cscopelist-am endif !%?SUBDIRS% -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ +cscopelist-am: $(am.tags.files) + list='$(am.tags.files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \