lilypond-0.0.47

diff --git a/Documentation/CodingStyle.pod b/Documentation/CodingStyle.pod
index 4661560af1de3231b0b95ff81d807a42fa29ee46..5ce7a20e04bd83982c930ff5ed7d419fc8a5cdee 100644 (file)
--- a/Documentation/CodingStyle.pod
+++ b/Documentation/CodingStyle.pod
@@ -45,8 +45,6 @@ extension ".cc".
 
 Inline definition files always have the file name extension ".icc".
 
-Template include files always have the file name extension ".tcc".
-
 
 =head2 INDENTATION
 
@@ -191,7 +189,7 @@ existed. I feel so stupid and ashamed!
 
 =head2 Disadvantages
 
-=over 4
+=over 5
 
 =item *
 
@@ -231,7 +229,7 @@ remains an issue.
 
 =head2 Proposal
 
-=over 4
+=over 5
 
 =item *
 
@@ -256,7 +254,7 @@ with the parts of the names separated by underscores.
 
 =head2 Types
 
-=over 4
+=over 5
 
 =item C<byte>
 
@@ -312,7 +310,7 @@ unsigned integer
 The following types modify the meaning of the prefix. 
 These are precede the prefixes:
 
-=over 4
+=over 5
 
 =item C<a>
 
@@ -346,7 +344,7 @@ reference
 
 =back
 
-=over 4
+=over 5
 
 =item C<loop_i>
 

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 817fbeb423c5e76e29570b95643cddedfce4ea2b..dc87ae02d99271d8d37689719251545b636f3ae9 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -20,7 +20,7 @@ include ./$(depth)/make/Files.make
 
 #
 
-OUTPODFILES = $(patsubst %,$(outdir)/%,$(PODFILES))
+OUTPODFILES = $(addprefix $(outdir)/,$(PODFILES))
 TEXTFILES = $(OUTPODFILES:.pod=.text)
 GROFFFILES = $(OUTPODFILES:.pod=.1)
 HTMLFILES = $(OUTPODFILES:.pod=.html)
@@ -32,11 +32,10 @@ EXTRA_DISTFILES = lelie_icon.gif lelie_logo.gif
 #
 
 default: do-doc
-
+       echo $(TEXTFILES) $(OUTPODFILES) $(PODFILES)
 do-doc: $(TEXTFILES)
 
-html: $(pod)
-       pod2html
+html: $(HTMLFILES)
 
 htmldist: html
        ./$(lily_bindir)/make_website
@@ -49,7 +48,7 @@ include ./$(depth)/make/Rules.make
 #
 
 localclean:
-       rm -f $(TEXTFILES) $(HTMLFILES) $(GROFFFILES)
+       rm -f $(TEXTFILES) $(HTMLFILES) $(GROFFFILES) $(HTMLFILES)
 
 localinstall: $(outdir)/lilypond.1 $(outdir)/mudela.5
        $(INSTALL) -d $(mandir)/man5

diff --git a/make/Rules.make b/make/Rules.make
index b7ec413b65f1b2358eb53643c6bc0878f7916e28..1b01a3ed278b6a145fb704e0519a8862de387780 100644 (file)
--- a/make/Rules.make
+++ b/make/Rules.make
@@ -9,15 +9,11 @@
 
 # this is supposed to clear all suffixes:
 .SUFFIXES:
+
 # so why does make still consider xx.y : RCS/xx.y,v ?
 # there is no suffix ,v anymore!
-.SUFFIXES: .cc .o .hh .y .l .pod .txt .1 .dep
+.SUFFIXES: .cc .o .hh .y .l .pod .txt .1 .dep .html
 
-# cancel implicit rules:
-#
-# shit, how to get rid of these stupid built-in rules?
-# include ./$(depth)/make/Builtin-rules.make
-#
 
 # compile rules:
 #
@@ -48,6 +44,10 @@ $(outdir)/%.text: $(outdir)/%.1
 $(depth)/%.text: $(outdir)/%.text
        cp $< $@
 
+$(outdir)/%.html: %.pod
+       $(pod2html)  $<
+       mv $(notdir $@) $(outdir)/
+
 $(outdir)/%.5: %.pod
        $(pod2groff)
 $(outdir)/%.1: %.pod