* lily/chord-name.cc: remove props chord, bass, inversion.

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index d52cf4765011333656c6e759fec5acf32efb15fa..09192b7e5a73f6caebee8dd6e0b469e798354b22 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -29,16 +29,10 @@ STEPMAKE_TEMPLATES=tex texinfo omf documentation
 OMF_FILES += $(outdir)/lilypond-internals.html.omf
 
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+LILYPOND_BOOK_FLAGS = --process="lilypond-bin -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"
 
 include $(depth)/make/stepmake.make 
 
-# Ugh,ugh.
-# emacs cannot fix the menu structure when @mbinclude is used
-# lilypond.tely uses mbinclude
-TEXINFO_SOURCES := $(filter-out lilypond.tely, $(TEXINFO_SOURCES))
-
-
 dvi: $(DVI_FILES)
 
 ps: $(PS_FILES)
@@ -66,24 +60,28 @@ extra-local-help:
 
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
+$(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi
+$(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
+
+
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi 
        mkdir -p $(dir $@)
-       $(MAKEINFO) --output=$(outdir)/lilypond --html $<
-       -cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond
-       -cp -f $(outdir)/lilypond/index.html $@
+       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --html $<
+       $(MAKEINFO) -I$(outdir) --output=$@ --html --no-split --no-headers $<
+       rm -f $(outdir)/lilypond/*.png $(outdir)/lilypond/*.ly 
+       -ln -f $(outdir)/*.png $(outdir)/*.ly $(outdir)/lilypond/
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) --output=$(outdir)/lilypond-internals --html $<
-       -cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond-internals
-       -cp -f $(outdir)/lilypond-internals/index.html $@
+       $(MAKEINFO) -I$(outdir) --output=$@ --html --no-split --no-headers $<
 
 ifeq ($(SPLITTING_MAKEINFO),yes)
 
 $(outdir)/lilypond.dvi: $(OUT_EPS_IMAGES) $(OUT_PNG_IMAGES)
 
 $(outdir)/%.png: %.png
-       convert -resize 50x50% $< $@
+       convert -geometry 50x50% $< $@
 
 $(outdir)/%.eps: %.png
        convert $< $@
@@ -123,25 +121,30 @@ local-clean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
        rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
-#$(outdir)/lilypond.nexi: $(outdir)/interfaces.itexi
-#$(outdir)/lilypond.texi: $(outdir)/interfaces.itexi
+# lilypond.texi deps
+$(builddir)/mf/$(outconfbase)/feta16list.ly:
+       $(MAKE) -C $(topdir)/mf
+
+$(outdir)/lilypond.texi: $(ITELY_FILES) macros.itexi 
 
 # Rules for the automatically generated documentation
 # When cross-compiling, we don't have lilypond, so we fake
 ifneq ($(CROSS),yes)
 
 
-# there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time.
-# however, this triggers compilation during install, which  is a bad thing (tm).
+# There used to be a dependency on a dummy target, to force a rebuild
+# of lilypond-internals every time.  however, this triggers
+# compilation during install, which is a bad thing (tm).
 
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose $(abs-srcdir)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond-bin
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin --verbose $(abs-srcdir)/ly/generate-documentation
+       rm -f $(outdir)/lilypond-internals.nexi
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused
 $(outdir)/interfaces.itexi: dummy
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond $(abs-srcdir)/ly/generate-interface-doc
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin $(abs-srcdir)/ly/generate-interface-doc
 
 else
 
@@ -154,3 +157,8 @@ $(outdir)/interfaces.itexi:
 endif
 
 
+local-clean: local-delete
+
+local-delete:
+       -rm -f $(outdir)/lily-1*
+       -rm -f $(outdir)/*