[tor-commits] [ooni-probe/master] * Minor change to Makefile.

isis at torproject.org isis at torproject.org
Fri Nov 16 00:50:07 UTC 2012


commit 64be6a7163534713ef50b527d47c90443be879fe
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Nov 15 23:06:57 2012 +0000

    * Minor change to Makefile.
---
 Makefile |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index a965c00..13d277e 100644
--- a/Makefile
+++ b/Makefile
@@ -158,14 +158,16 @@ libdnet:
 
 scapy-all: scapy pypcap libdnet
 
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && make tags); \
-	done
-
 ETAGS = etags
 ETAGSFLAGS =
 ETAGSARGS =
+## or change to ${SUBDIRS}
+TAGME = ${topsrc_dir}
+
+tags-recursive:
+	list='$(TAGME)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && make tags); \
+	done
 
 tags: TAGS
 
@@ -182,17 +184,19 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	echo ${E_OR_V}; \
+	list='$(TAGME)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
-	    if test -f "$$i"; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	    if test -f "$$i"; then echo $$i; fi; \
+	  done;`
 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	  || $(ETAGS) $(ETAGSFLAGS) $(ETAGS_ARGS) $$tags $$unique
+
+awkward:
+	  | $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \





More information about the tor-commits mailing list