Add tags/TAGS target; rm tags/TAGS in clean

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 590da9752e5403795b897bc4c090103a84b09f28..372cd38dcd13c31409f9b5df5f9d7a1292becf12 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -497,7 +497,7 @@ libclean:
 clean: libclean
        rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
        @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
-       rm -f $(LIBS)
+       rm -f $(LIBS) tags TAGS
        rm -f openssl.pc libssl.pc libcrypto.pc
        rm -f speed.* .pure
        rm -f $(TARFILE)
@@ -557,9 +557,12 @@ depend:
 lint:
        @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
 
-tags:
-       rm -f TAGS
-       find . -name '[^.]*.[ch]' | xargs etags -a
+tags TAGS: FORCE
+       rm -f TAGS tags
+       -ctags -R .
+       -etags -R .
+
+FORCE:
 
 errors:
        $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
@@ -714,7 +717,7 @@ install_html_docs:
                        echo "installing html/$$fn.$(HTMLSUFFIX)"; \
                        cat $$i \
                        | sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
-                       | pod2html --podroot=doc --htmlroot=.. --podpath=apps:crypto:ssl \
+                       | pod2html --podroot=doc --htmlroot=.. --podpath=$$subdir:apps:crypto:ssl \
                        | sed -r 's/<!DOCTYPE.*//g' \
                        > $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
                        $(PERL) util/extract-names.pl < $$i | \