[Gnucash-changes] Chris Shoemaker's enhancements to tags generation.

[David Hampton]

Log Message:
-----------
Chris Shoemaker's enhancements to tags generation.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
        Makefile.TAGS
        Makefile.am

Revision Data
-------------
Index: Makefile.TAGS
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Makefile.TAGS,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -LMakefile.TAGS -LMakefile.TAGS -u -r1.2.4.4 -r1.2.4.5
--- Makefile.TAGS
+++ Makefile.TAGS
@@ -7,25 +7,17 @@
 # i.e. TAGS: etags.files $(shell cat etags.files) doesn't work right
 # because etags.files contents are expanded before it's re-generated.
 
-# The $(shell find . -type d) dependency seems to be pointless -- it
-# always fires.  It appears that someone's always touching something.
-etags.files: $(shell find . -type d)
-	find . -path './debian' -prune -o -path './.pc' -prune -o \
-		-path '*.#*' -prune -o -name '*.[ch]' -print -o \
-		-name '*.scm' -print | sort > etags.files.tmp
-	@if cmp --quiet etags.files etags.files.tmp; \
-        then \
-          echo "TAGS file list hasn't changed."; \
-          rm -f etags.files.tmp; \
-        else \
-          echo "TAGS file list has changed."; \
-          mv etags.files.tmp etags.files; \
-        fi
+etags.files: $(shell find . -mindepth 1 -type d ! -name CVS ! -path "*/.*")
+	find . -path '*/.*' -prune -o \( -name '*.[ch]' -o -name '*.scm' \) \
+		-print | sort > etags.files.tmp
+	cmp -s etags.files etags.files.tmp || cp etags.files.tmp etags.files
+	rm -f etags.files.tmp
+	touch etags.files
 
 # we don't need an etags.files dep here b/c you always call this after
 # re-generating etags.files if needed from the top-level Makefile.am.
-etags: $(shell cat etags.files)
+TAGS: $(shell cat etags.files)
 	etags `cat etags.files`
 
-ctags: $(shell cat etags.files)
+tags: $(shell cat etags.files)
 	ctags `cat etags.files`
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.350
retrieving revision 1.1487.2.351
diff -LChangeLog -LChangeLog -u -r1.1487.2.350 -r1.1487.2.351
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,8 @@
 2005-10-23  David Hampton  <hampton at employees.org>
 
+	* Makefile.TAGS:
+	* Makefile.am: Chris Shoemaker's enhancements to tags generation.
+
 	* src/gnome-utils/dialog-options.c: Disable the "OK" and "Apply"
 	buttons before calling the apply function.  Makes the UI appear
 	more responsive and prevents a crash if the user clicks Apply then
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Makefile.am,v
retrieving revision 1.55.4.9
retrieving revision 1.55.4.10
diff -LMakefile.am -LMakefile.am -u -r1.55.4.9 -r1.55.4.10
--- Makefile.am
+++ Makefile.am
@@ -97,7 +97,7 @@
         # make sure etags.files is up to date.
 	${MAKE} -f Makefile.TAGS etags.files
         # now use the contents of etags.files to re-make TAGS if needed.
-	${MAKE} -f Makefile.TAGS etags
+	${MAKE} -f Makefile.TAGS TAGS
 
 else
 
@@ -112,7 +112,7 @@
         # make sure etags.files is up to date.
 	${MAKE} -f Makefile.TAGS etags.files
         # now use the contents of etags.files to re-make TAGS if needed.
-	${MAKE} -f Makefile.TAGS ctags
+	${MAKE} -f Makefile.TAGS tags
 
 else