INN commit: trunk (17 files)

INN Commit rra at isc.org
Sat Jul 3 17:16:55 UTC 2010


    Date: Saturday, July 3, 2010 @ 10:16:54
  Author: eagle
Revision: 9081

remove broken tags / ctags make targets

These targets have been broken for some time and wouldn't work with GNU
ctags anyway. Just do 'ctags -R' in the toplevel source directory and
put 'set tags=./tags,tags,/path/to/source/tags' in your .vimrc if you
want to use tags.

Patch from Florian Schlichting.

Modified:
  trunk/Makefile
  trunk/Makefile.global.in
  trunk/authprogs/Makefile
  trunk/backends/Makefile
  trunk/doc/Makefile
  trunk/doc/man/Makefile
  trunk/doc/pod/hacking.pod
  trunk/expire/Makefile
  trunk/frontends/Makefile
  trunk/history/Makefile
  trunk/include/Makefile
  trunk/innd/Makefile
  trunk/innfeed/Makefile
  trunk/lib/Makefile
  trunk/nnrpd/Makefile
  trunk/site/Makefile
  trunk/storage/Makefile

---------------------+
 Makefile            |    9 +++------
 Makefile.global.in  |    1 -
 authprogs/Makefile  |    3 ---
 backends/Makefile   |    8 +-------
 doc/Makefile        |    1 -
 doc/man/Makefile    |    1 -
 doc/pod/hacking.pod |    9 ++++-----
 expire/Makefile     |    8 +-------
 frontends/Makefile  |    8 +-------
 history/Makefile    |    3 ---
 include/Makefile    |    2 +-
 innd/Makefile       |    8 +-------
 innfeed/Makefile    |    5 +----
 lib/Makefile        |    3 ---
 nnrpd/Makefile      |    8 +-------
 site/Makefile       |    5 +----
 storage/Makefile    |    3 ---
 17 files changed, 15 insertions(+), 70 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -157,7 +157,7 @@
 	    cd $$D && $(MAKE) $(FLAGS) distclean || exit 1 ; cd .. ; \
 	done
 	@echo ''
-	rm -f LIST.* Makefile.global TAGS tags config.cache config.log
+	rm -f LIST.* Makefile.global config.cache config.log
 	rm -f config.status libtool support/fixconfig support/fixscript
 	rm -f config.status.lineno configure.lineno
 
@@ -170,23 +170,20 @@
 	    cd $$D && $(MAKE) $(FLAGS) maintclean || exit 1 ; cd .. ; \
 	done
 	@echo ''
-	rm -f LIST.* Makefile.global TAGS tags config.cache config.log
+	rm -f LIST.* Makefile.global config.cache config.log
 	rm -f config.status libtool support/fixconfig support/fixscript
 	rm -f config.status.lineno configure.lineno
 	rm -f CHANGES ChangeLog inn*.tar.gz configure include/config.h.in
 	rm -rf $(TARDIR)
 
 ##  Other generic targets.
-bootstrap depend tags ctags profiled:
+bootstrap depend profiled:
 	@for D in $(ALLDIRS) ; do \
 	    echo '' ; \
 	    cd $$D && $(MAKE) $@ || exit 1 ; cd .. ; \
 	done
 
-TAGS etags:
-	etags */*.c */*.h */*/*.c */*/*.h
 
-
 ##  Run the test suite.
 check test tests:
 	cd tests && $(MAKE) test || exit 1 ; cd ..

Modified: Makefile.global.in
===================================================================
--- Makefile.global.in	2010-06-28 18:04:22 UTC (rev 9080)
+++ Makefile.global.in	2010-07-03 17:16:54 UTC (rev 9081)
@@ -187,7 +187,6 @@
 AWK		= @AWK@
 BZIP2		= @BZIP2@
 COMPRESS	= @COMPRESS@
-CTAGS		= ctags -t -w
 GZIP		= @GZIP@
 LEX		= @LEX@
 LN_S		= @LN_S@

Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ authprogs/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -33,9 +33,6 @@
 	rm -f *.o $(ALL)
 	rm -rf .libs
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES) ../lib/*.c ../include/*.h
-
 profiled:
 	$(MAKEPROFILING) all
 

Modified: backends/Makefile
===================================================================
--- backends/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ backends/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -53,19 +53,13 @@
 
 bootstrap: $(MAN)
 
-clean:
+clean clobber distclean:
 	rm -f *.o $(ALL)
 	rm -rf .libs
 
-clobber distclean: clean
-	rm -f tags
-
 maintclean: distclean
 	rm -f $(MAN)
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES)
-
 profiled:
 	$(MAKEPROFILING) all
 

Modified: doc/Makefile
===================================================================
--- doc/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ doc/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -19,7 +19,6 @@
 all:
 	cd pod && $(MAKE) all || exit 1 ; cd ..
 
-tags ctags:
 profiled:
 depend:
 

Modified: doc/man/Makefile
===================================================================
--- doc/man/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ doc/man/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -34,7 +34,6 @@
 
 all:
 clobber clean distclean:
-tags ctags:
 profiled:
 
 install: install-man1 install-man3 install-man3pm install-man5 install-man8

Modified: doc/pod/hacking.pod
===================================================================
--- doc/pod/hacking.pod	2010-06-28 18:04:22 UTC (rev 9080)
+++ doc/pod/hacking.pod	2010-07-03 17:16:54 UTC (rev 9081)
@@ -280,11 +280,10 @@
 INN uses, for use in building the list of installed paths to files.
 
 Each subdirectory makefile should have the targets C<all> (the default),
-C<clean>, C<clobber>/C<distclean>, C<install>, C<tags>, and C<profiled>.
-The C<tags> target generates B<vi> tags files, and the C<profiled> target
-generates a profiling version of the programs (although this hasn't been
-tested much).  These rules should be present and empty in those
-directories where they don't apply.
+C<clean>, C<clobber>/C<distclean>, C<install>, and C<profiled>.  The
+C<profiled> target generates a profiling version of the programs (although
+this hasn't been tested much).  These rules should be present and empty in
+those directories where they don't apply.
 
 Be sure to test compiling with both static and dynamic libraries and make
 sure that all the libtool support works correctly.  All linking steps, and

Modified: expire/Makefile
===================================================================
--- expire/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ expire/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -27,18 +27,12 @@
 
 bootstrap:
 
-clean:
+clean clobber distclean maintclean:
 	rm -f *.o $(ALL)
 	rm -f profiled expirep
 	rm -rf .libs
 
-clobber distclean maintclean: clean
-	rm -f tags
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES)
-
-
 ##  Compilation rules.
 
 BOTH		= $(LIBHIST) $(LIBSTORAGE) $(LIBINN)

Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ frontends/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -44,19 +44,13 @@
 
 bootstrap: $(MAN)
 
-clean:
+clean clobber distclean:
 	rm -f *.o $(ALL)
 	rm -rf .libs
 
-clobber distclean: clean
-	rm -f tags
-
 maintclean: distclean
 	rm -f $(MAN)
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES)
-
 profiled:
 	$(MAKEPROFILING) all
 

Modified: history/Makefile
===================================================================
--- history/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ history/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -38,9 +38,6 @@
 maintclean: distclean
 	rm -f Make.methods hismethods.c hismethods.h
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES) ../include/*.h
-
 $(FIXSCRIPT):
 	@echo Run configure before running make.  See INSTALL for details.
 	@exit 1

Modified: include/Makefile
===================================================================
--- include/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ include/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -24,7 +24,7 @@
 clobber distclean maintclean: clean
 	rm -f $(EXTRA)
 
-depend tags ctags:
+depend:
 
 profiled: all
 

Modified: innd/Makefile
===================================================================
--- innd/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ innd/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -26,17 +26,11 @@
 
 bootstrap:
 
-clean:
+clean clobber distclean maintclean:
 	rm -f *.o $(ALL) inndp
 	rm -rf .libs
 
-clobber distclean maintclean: clean
-	rm -f tags
 
-tags ctags: $(SOURCES) $(EXTRASOURCES)
-	$(CTAGS) $(SOURCES) $(EXTRASOURCES) ../lib/*.c innd.h ../include/*.h
-
-
 ##  Compilation rules.
 
 INNDLIBS 	= $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) \

Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ innfeed/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -37,14 +37,11 @@
 	rm -rf .libs
 
 clobber distclean: clean 
-	rm -f tags y.tab.c y.tab.h lex.yy.c
+	rm -f y.tab.c y.tab.h lex.yy.c
 
 maintclean: distclean
 	rm -f config_l.c config_y.c config_y.h
 
-tags: $(SOURCES) $(INCLUDES)
-	$(CTAGS) $(SOURCES) $(INCLUDES)
-
 $(FIXSCRIPT):
 	@echo Run configure before running make.  See INSTALL for details.
 	@exit 1

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ lib/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -45,9 +45,6 @@
 	rm -f libinn_pure_*.a .pure
 	rm -rf .libs
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES) ../include/*.h
-
 libinn.la: $(OBJECTS) $(LOBJECTS)
 	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) $(LIBS) \
 	    -rpath $(PATHLIB) -version-info 2:0:0

Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ nnrpd/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -25,17 +25,11 @@
 
 bootstrap:
 
-clean:
+clean clobber distclean maintclean:
 	rm -f *.o $(ALL) nnrpdp profiled
 	rm -rf .libs
 
-clobber distclean maintclean: clean
-	rm -f tags
 
-tags ctags: $(SOURCES) $(INCLUDES)
-	$(CTAGS) $(SOURCES) $(INCLUDES) ../lib/*.c ../include/*.h
-
-
 ##  Compilation rules.
 
 NNRPDLIBS	= $(LIBHIST) $(LIBSTORAGE) $(LIBINN) $(STORAGE_LIBS) \

Modified: site/Makefile
===================================================================
--- site/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ site/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -159,11 +159,8 @@
 	done
 
 clobber distclean maintclean:
-	rm -f $(ALL) tags profiled config update
+	rm -f $(ALL) profiled config update
 
-tags ctags:
-	cp /dev/null tags
-
 profiled:
 	cp /dev/null profiled
 

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2010-06-28 18:04:22 UTC (rev 9080)
+++ storage/Makefile	2010-07-03 17:16:54 UTC (rev 9081)
@@ -42,9 +42,6 @@
 maintclean: distclean
 	rm -f Make.methods methods.c methods.h ovmethods.c ovmethods.h
 
-tags ctags: $(SOURCES)
-	$(CTAGS) $(SOURCES) ../include/*.h ../include/inn/*.h
-
 $(FIXSCRIPT):
 	@echo Run configure before running make.  See INSTALL for details.
 	@exit 1




More information about the inn-committers mailing list