From 526eaa41f5fe252306c86bf7281cd6628a565bf1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 25 Nov 1995 01:00:53 +0000 Subject: [PATCH] Don't use double-colon rules --- lib/am/tags.am | 12 ++++++++---- tags-subd.am | 8 ++++---- tags.am | 12 ++++++++---- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/am/tags.am b/lib/am/tags.am index 8da4b547..eca6bda5 100644 --- a/lib/am/tags.am +++ b/lib/am/tags.am @@ -1,12 +1,16 @@ -tags TAGS:: +tags: TAGS + +TAGS: tags=; \ + here=`pwd`; \ for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) TAGS); \ if test -f $$subdir/TAGS; then \ - tags="$$tags -i $$subdir/TAGS"; \ + tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ - if test -n "$(ETAGS_ARGS)$(CONFIG_HEADER)$$tags"; then \ - etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER); \ + if test -n "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags"; \ + then \ + etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS); \ fi diff --git a/tags-subd.am b/tags-subd.am index d55cbd21..c8d21200 100644 --- a/tags-subd.am +++ b/tags-subd.am @@ -1,10 +1,10 @@ -id:: ID +id: ID -ID:: +ID: here=`pwd`; cd $(srcdir) && mkid -f $$here/ID $(SOURCES) $(HEADERS) -tags:: TAGS +tags: TAGS -TAGS:: +TAGS: here=`pwd`; cd $(srcdir) && etags $(ETAGS_ARGS) $(SOURCES) $(HEADERS) -o $$here/TAGS diff --git a/tags.am b/tags.am index 8da4b547..eca6bda5 100644 --- a/tags.am +++ b/tags.am @@ -1,12 +1,16 @@ -tags TAGS:: +tags: TAGS + +TAGS: tags=; \ + here=`pwd`; \ for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) TAGS); \ if test -f $$subdir/TAGS; then \ - tags="$$tags -i $$subdir/TAGS"; \ + tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ - if test -n "$(ETAGS_ARGS)$(CONFIG_HEADER)$$tags"; then \ - etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER); \ + if test -n "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags"; \ + then \ + etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS); \ fi -- 2.43.5