Don't use double-colon rules

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 8da4b54..eca6bda 100644 (file)
--- 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 d55cbd2..c8d2120 100644 (file)
--- 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 8da4b54..eca6bda 100644 (file)
--- 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