TAGS diff.
Matthew Vanecek
mevanecek@yahoo.com
28 Nov 2002 23:08:08 -0600
--=-TmiNXasMgFN87Fj/zjIi
Content-Type: multipart/mixed; boundary="=-jii+685gQ98CWHHQJSOm"
--=-jii+685gQ98CWHHQJSOm
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
The attached patch removes the automatic make of the TAGS file with
"--enable-etags", and replaces it with an etags target. It also adds a
ctags target, since some of use use Vi instead of emacs. ctargs are
enabled via --enable-ctags. Both targets must be run manually--they are
not automatic. Certain confluences of Sun, Moon, and Planets with
proper incantations and incense abounding causes the automatic tag build
to fail.
I left it in configure.in because it seemed the thing to do--no sense
having the stuff in Makefile if you're just building a package...
We talked about this on #gnucash, and nobody seemed to object to making
it a manual target.
--=20
Matthew Vanecek
perl -e 'print $i=3Dpack(c5,(41*2),sqrt(7056),(unpack(c,H)-2),oct(115),10);'
***************************************************************************=
*****
For 93 million miles, there is nothing between the sun and my shadow except=
me.
I'm always getting in the way of something...
--=-jii+685gQ98CWHHQJSOm
Content-Type: application/DEFANGED-13; name="tags_diff.DEFANGED-13"; charset="ISO-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="tags_diff.DEFANGED-13"
? intl/gettext.h
? intl/libgettext.h
? src/doc/html
Index: .cvsignore
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/.cvsignore,v
retrieving revision 1.32
diff -u -r1.32 .cvsignore
--- .cvsignore 21 Jun 2002 18:17:21 -0000 1.32
+++ .cvsignore 29 Nov 2002 04:58:12 -0000
@@ -39,6 +39,7 @@
intltool-merge.in
intltool-update
intltool-update.in
+tags
*.tar.gz
*.log
*.patch
Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1207
diff -u -r1.1207 ChangeLog
--- ChangeLog 28 Nov 2002 17:52:20 -0000 1.1207
+++ ChangeLog 29 Nov 2002 04:58:36 -0000
@@ -1,3 +1,19 @@
+2002-11-28 Matthew Vanecek <mevanecek@yahoo.com>
+
+ * Makefile.am: Added the GNC_CTAGS_FILE token, and added the
+ ctags target. Changed the TAGS target to etags, and
+ GNC_TAGS_FILE to GNC_ETAGS_FILE. Removed GNC_TAGS_FILE from the
+ noinst_DATA variable. This makes tag building a manual target.
+ Run "make ctags" for Vi tags, or "make etags" for Emacs TAGS.
+
+ * Makefile.TAGS: Changed the TAGS target to etags, and added
+ the ctags target.
+
+ * configure.in: Added the --enable-ctags option.
+
+ * .cvsignore: Added tags to .cvsignore. tags is the file created
+ by ctags.
+
2002-11-28 Christian Stimming <stimming@tuhh.de>
=20
* src/import-export/gnc-gen-transaction.c: Use add_threshold
Index: Makefile.TAGS
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/Makefile.TAGS,v
retrieving revision 1.1
diff -u -r1.1 Makefile.TAGS
--- Makefile.TAGS 4 Dec 2001 22:40:48 -0000 1.1
+++ Makefile.TAGS 29 Nov 2002 04:58:36 -0000
@@ -22,5 +22,8 @@
=20
# 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.
-TAGS: $(shell cat etags.files)
+etags: $(shell cat etags.files)
etags `cat etags.files`
+
+ctags: $(shell cat etags.files)
+ ctags `cat etags.files`
Index: Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/Makefile.am,v
retrieving revision 1.50
diff -u -r1.50 Makefile.am
--- Makefile.am 27 Nov 2002 22:48:58 -0000 1.50
+++ Makefile.am 29 Nov 2002 04:58:36 -0000
@@ -3,7 +3,10 @@
=20
docdir =3D ${GNC_DOC_INSTALL_DIR}
=20
-noinst_DATA =3D make-gnucash-patch make-gnucash-potfiles @GNC_TAGS_FILE@
+GNC_CTAGS_FILE =3D @GNC_CTAGS_FILE@
+GNC_ETAGS_FILE =3D @GNC_ETAGS_FILE@
+
+noinst_DATA =3D make-gnucash-patch make-gnucash-potfiles
=20
doc_DATA =3D \
AUTHORS \
@@ -84,22 +87,37 @@
cscope.out: cscope.files
cscope -b
=20
-if GNC_TAGS_FILE
+if GNC_ETAGS_FILE
+
+etags:
+ # 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
+
+else
+
+etags:
+ @echo "You must ./configure with --enable-etags to use ctags."
+
+endif
+
+if GNC_CTAGS_FILE
=20
-TAGS:
+ctags:
# 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 TAGS
+ ${MAKE} -f Makefile.TAGS ctags
=20
else
=20
-TAGS:
- @echo "You must ./configure with --enable-etags to use TAGS."
+ctags:
+ @echo "You must ./configure with --enable-ctags to use ctags."
=20
endif
=20
-.PHONY: TAGS
+.PHONY: etags ctags
=20
ACLOCAL_AMFLAGS =3D -I m4
=20
Index: configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.328
diff -u -r1.328 configure.in
--- configure.in 27 Nov 2002 22:48:58 -0000 1.328
+++ configure.in 29 Nov 2002 04:58:39 -0000
@@ -544,10 +544,26 @@
USE_ETAGS=3D0)
=20
if test ${USE_ETAGS} =3D 1; then
- AC_CHECK_PROG(GNC_TAGS_FILE, etags, TAGS)
+ AC_CHECK_PROG(GNC_ETAGS_FILE, etags, TAGS)
fi
=20
-AM_CONDITIONAL(GNC_TAGS_FILE, test x${GNC_TAGS_FILE} =3D xTAGS)
+AM_CONDITIONAL(GNC_ETAGS_FILE, test x${GNC_ETAGS_FILE} =3D xTAGS)
+
+### ----------------------------------------------------------------------=
----
+### Check for ctags
+
+AC_ARG_ENABLE( ctags,
+ [ --enable-ctags enable automatic create of tags file],
+ if test $enableval =3D yes; then
+ USE_CTAGS=3D1
+ fi,
+ USE_CTAGS=3D0)
+
+if test ${USE_CTAGS} =3D 1; then
+ AC_CHECK_PROG(GNC_CTAGS_FILE, ctags, tags)
+fi
+
+AM_CONDITIONAL(GNC_CTAGS_FILE, test x${GNC_CTAGS_FILE} =3D xtags)
=20
### ----------------------------------------------------------------------=
----
### Check for perl
@@ -1138,4 +1154,4 @@
gnucash-config
,
dnl # commands go here, but we don't have any right now
- )
\ No newline at end of file
+ )
--=-jii+685gQ98CWHHQJSOm--
--=-TmiNXasMgFN87Fj/zjIi
Content-Type: application/DEFANGED-14; name="signature_asc.DEFANGED-14"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQA95vY3OMmiB1jXEBsRAsCZAJwNFItF22g0IlD90sCnblXfeZq+vQCcDj2Z
hHYJxMKTxxtNWTidFQ70ZXc=
=NeUk
-----END PGP SIGNATURE-----
--=-TmiNXasMgFN87Fj/zjIi--