release: 1.1.44

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

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index cf5b0a77bf22cb1fd2d5cc6ca019dfe356497aba..6a627fe2d5772a7048d98c2cf448e34f5936948c 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -4,21 +4,19 @@
 local-dist: configure 
 
 local-distclean: 
-       rm -f config.hh config.make Makefile config.cache \
-               config.status config.log index.html
+       rm -f config.h config.hh config.make Makefile GNUmakefile \
+               config.cache config.status config.log index.html
 
 local-maintainerclean:
        rm -f configure
 
 GNUmakefile: make/toplevel.make.in
-       chmod +w $@
-       echo "# WARNING WARNING WARNING WARNING" > $@
-       echo "# do not edit! this is generated from make/Toplevel.make.in" >> $@
-       cat $< >> $@
-       chmod -w $@
+       $(MAKE) INFILE=$< OUTFILE=$@ -f $(stepdir)/automatically-generated.sub.make
 
-aclocal.m4: $(stepdir)/../aclocal.m4
-       cp $< $@
+ifneq ($(PACKAGE),STEPMAKE)
+aclocal.m4: $(stepmake)/aclocal.m4
+       $(MAKE) INFILE=$< OUTFILE=$@ LINECOMMENT=dnl -f $(stepdir)/automatically-generated.sub.make
+endif
 
 local-WWW: #index.html 
 
@@ -26,10 +24,12 @@ index.html: check-top-web NEWS
        $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
        $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=Documentation/top-docs/out-www/index.html $@
 
-WWW-clean:
+WWW-clean: local-WWW-clean
        $(MAKE) CONFIGSUFFIX='www' clean
 
-dist:  
+local-WWW-clean:
+
+dist:
        rm -rf $(distdir)
        $(MAKE) local-dist $(distdir)
        chmod -R a+r $(distdir)
@@ -38,10 +38,7 @@ dist:
 # ugh.
 # Can't compare "stage1" dist with "stage2" dist in this way?
        -ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
-       rm -rf ./$(distdir)/
+       rm -rf $(distdir)/
 
 local-help:
-       @echo -e "\
-  dist        roll tarball: $(outdir)/$(package)-$(TOPLEVEL_VERSION).tar.gz\n"
-