Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer

[lilypond.git] / stepmake / stepmake / toplevel-targets.make

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 4633f8be1a323352441171d9c5ec8d3c0fe222a6..28628efb029b101f15570e8f17b3f6a4f716b0b5 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -1,11 +1,12 @@
 include $(stepdir)/www-targets.make
 
-local-dist: configure 
+local-dist: configure
 
-local-distclean: 
+local-distclean:
        rm -f config.hh config.make Makefile GNUmakefile \
                config.cache config.status config.log index.html \
                stepmake/stepmake/stepmake stepmake/stepmake/bin
+       rm -rf autom4te.cache
 
 local-maintainerclean:
        rm -f configure
@@ -28,7 +29,7 @@ $(package-icon):
 
 
 do-top-doc:
-       -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top
+       -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(TOPDOC_FILES)" make-txt-files
 
 
 $(README_TXT_FILES): do-top-doc
@@ -47,11 +48,8 @@ dist:
        rm -rf $(distdir)
        $(MAKE) local-dist $(distdir)
        chmod -R a+r $(distdir)
-       chmod  a+x `find $(distdir) -type d -print` 
+       chmod  a+x `find $(distdir) -type d -print`
        (cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-# ugh.
-# Can't compare "stage1" dist with "stage2" dist in this way?
-       -ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
        rm -rf $(distdir)/
 
 #
@@ -67,12 +65,16 @@ local-help:
   .             release==\n\
   .             to=0.1.74.jcn2\n\
   dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
-  distclean   cleaner than clean (duh)\n\
-  doc         update all documentation\n\
-  release     roll tarball and generate patch\n\
+  distclean   also remove configure output\n\
+  doc         update all documentation (without images)\n\
+  cvs-clean   also remove out directories and generated files\n\
+  info        update info docs (without images)\n\
+  info out=www  update info docs with images\n\
+  maintainerclean also remove distributed generated files\n\
   po          make new translation Portable Object database\n\
   po-replace  do po-update and replace catalogs with msgmerged versions\n\
   po-update   update translation Portable Object database\n\
+  release     roll tarball and generate patch\n\
 \n\
 Some of these top level targets (diff, dist, release) can be issued\n\
 from anywhere in the source tree.\n\