*** empty log message ***

diff --git a/.cvsignore b/.cvsignore
index 8f0fecb20e94a00bc91a03687d41451561cf5644..c2a489a375360e5691caa39f4e09ccf987098a5e 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,6 +10,7 @@
 *.midi
 *.patch
 *.pats
+*.pats
 *.pdf
 *.png
 *.ps
@@ -19,22 +20,28 @@
 *.tex
 *.twy
 *.txt
+*/out/*
 *[0-9]pk
 *configure
 *~
 .gdbinit
-.gdbinit
 .htaccess
 .lineno
 GNUmakefile
+aclocal.m4
 autom4te.cache
 config-*.h
+config-*.hh
 config-*.make
+config-*.status
+config.hh
+config.make
+config.status
 custom.py
 dummy.dep
 nohup.out
-*/out/*
 out
 out-*
 out-www
+pats
 socket-output

diff --git a/ChangeLog b/ChangeLog
index 75255614c1dd8e2a353aaf0a67d861a8c7fb1068..fd68c9f1ba52f4e4b5d7cdeec29fadbe5079c125 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-04  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * Remove trailing whitespace from makefiles.
+       
+       * flower/include/std-vector.hh: Add binary_search_bounds workaround
+       for earlier gcc.
+
        * .cvsignore: Add out*, out-www, config-*.  Remove lots of cruft.
 
        * flower/include/std-vector.hh[!HAVE_STL_DATA_METHOD]: Workaround.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 423b5514278297af0dfee1c8b7e8ccd3c98c6819..2b57b008f94ae28eaf0d790c9103caa36469872a 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -8,7 +8,7 @@ LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-che
 README_TOP_FILES= DEDICATION THANKS ChangeLog
 EXTRA_DIST_FILES= texinfo.css
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 default: local-doc
 

diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index 1aac8d62e8d4adfce4fb7e8343b13110f7f15850..a9bbdc383d995c0a898029758b30ce1267500aaf 100644 (file)
--- a/Documentation/bibliography/GNUmakefile
+++ b/Documentation/bibliography/GNUmakefile
@@ -9,7 +9,7 @@ EXTRA_DIST_FILES= $(BIB_FILES) $(wildcard *.bst)
 STEPMAKE_TEMPLATES=tex documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 dvi: $(DVI_FILES) $(OUT_BIB_FILES)
 

diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index 11691ffd959b85c2a8f451b46482a4989f6541b9..2e22c03997ae3dd4eb6a1a4dd40a8e48452eff68 100644 (file)
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -7,11 +7,11 @@ STEPMAKE_TEMPLATES=documentation  texinfo
 TEXTS = $(wildcard ANNOUNCE-*[0-9]) $(wildcard CHANGES-*[0-9]) $(wildcard ChangeLog*[0-9]) $(wildcard NEWS-*[0-9])
 EXTRA_DIST_FILES = $(TEXTS)
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 default: local-doc
 
-#urg default local-WWW target uses footify before its time; 
+#urg default local-WWW target uses footify before its time;
 # must add footify with txt-to-html target
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS)))
 ##local-WWW: $(OUT_TXT_FILES) $(OUT_HTMLFILES) txt-to-html

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index a156a106c7406fc91e0daf2ecf419ce17ac2abbc..5ac3a4beeb2f6a7884f81986c5fe8435cc0f124c 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -28,7 +28,7 @@ $(outdir)/%.png: %.xpm
 
 $(outdir)/%-48.png: %.xpm
        convert -sample 48 -depth 24 $< $@
-                  
+               
 $(outdir)/%-32.png: %.xpm
        convert -depth 24 -sample 32 $< $@
 

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 7649029fe17313f753e393ef866cef9397942f1f..2659703f4fcebc312def7ece2d7148b32a7a5be7 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -5,7 +5,7 @@ STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html) $(TELY_FILES:%.tely=$(outdir)/%.html)
 PDF_FILES=$(outdir)/NEWS.pdf
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 ifneq ($(out),www)
 LILYPOND='true'

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index ca93cec69bccbc6853f1366245ddd9c1b666dfd4..31094c6bb7ab0c806326dc52631712755753d270 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -33,7 +33,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly
 TEXINPUTS=$(top-src-dir)/tex::
 export TEXINPUTS
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 dvi: $(DVI_FILES)
 
@@ -127,7 +127,7 @@ endif
 local-install-WWW: local-install-info
 local-uninstall-WWW: local-uninstall-info
 
-default: 
+default:
 
 
 local-help: extra-local-help
@@ -152,7 +152,7 @@ $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
        find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
-# symbolic links to save space 
+# symbolic links to save space
        (cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
 
 #
@@ -181,10 +181,10 @@ $(outdir)/music-glossary/index.html: $(outdir)/music-glossary.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) --output=$(outdir)/music-glossary --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
        find $(outdir)/music-glossary/ -name '*'.png -o -name '*'.ly | xargs rm -f
-# symbolic links to save space 
+# symbolic links to save space
        (cd $(outdir)/music-glossary/ ; ln -sf ../*.png ../*.ly . )
 
-$(outdir)/lilypond.xml: $(outdir)/lilypond.texi 
+$(outdir)/lilypond.xml: $(outdir)/lilypond.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$@ --docbook $<
 
@@ -236,14 +236,14 @@ $(outdir)/%.bib: %.bib
        ln -f $< $@
 
 local-clean:
-       rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
+       rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
        rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/music-glossary
 
 # lilypond.texi deps
 $(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
        $(MAKE) -C $(top-src-dir)/mf
 
-$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) 
+$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES)
 $(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
 # Prevent building music-glossary.texi from default target

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c84bf3fa4cebe5a83c66438e224bee4bce2360eb..e144e60bd2200beacb768798f99ba97bf5e900b9 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -30,7 +30,7 @@ INSTALLATION_FILES=$(config_make) VERSION
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 doc: 
        $(MAKE) -C Documentation

diff --git a/buildscripts/GNUmakefile b/buildscripts/GNUmakefile
index 5fd1c7b89b7115b0ad76d2a59063339d34b30df1..3a40aa0fad1cf30fa0709f3048a3ea0e809616fe 100644 (file)
--- a/buildscripts/GNUmakefile
+++ b/buildscripts/GNUmakefile
@@ -3,7 +3,7 @@ depth = ..
 STEPMAKE_TEMPLATES=script install po
 EXTRA_DIST_FILES=pfx2ttf.fontforge
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 # Should we install these? This should be handled by sysadmin or
 # packager but if she forgets...

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index 7b53ec5766061874b2d4cffadb2f346b5ce9fabe..ae9a0fee13395a5eeafec72ba8ec207ee8128707 100644 (file)
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -22,7 +22,7 @@ $(outdir)/%.sh: %.sh $(config_make)
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-default: $(OUT_POSTINSTALLS) $(OUTIN_FILES) 
+default: $(OUT_POSTINSTALLS) $(OUTIN_FILES)
 
 INSTALLATION_OUT_SUFFIXES=1
 

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index efb2026eab2abad084052174b0f88d90e9766fa4..a92370d521dbbb8b6e5387831ac06d911ee84acb 100644 (file)
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -10,7 +10,7 @@ INSTALLATION_OUT_FILES=$(outdir)/lilypond-words.el
 
 STEPMAKE_TEMPLATES=elisp install install-out
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 LILYPOND_WORDS = $(outdir)/lilypond-words.el
 LILYPOND_WORDS_DEPENDS =\
@@ -19,7 +19,7 @@ LILYPOND_WORDS_DEPENDS =\
   $(top-src-dir)/scm/markup.scm \
   $(top-src-dir)/ly/engraver-init.ly
 
-$(LILYPOND_WORDS): 
+$(LILYPOND_WORDS):
        cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --el --dir=$(top-build-dir)/elisp/$(outconfbase)
 
 all: $(LILYPOND_WORDS)

diff --git a/flower/GNUmakefile b/flower/GNUmakefile
index 6c7804314247928f6de5021d4048ee8001c27f26..d8ea4bddfc8e33b9d5a72bea81138d0927f0cf41 100644 (file)
--- a/flower/GNUmakefile
+++ b/flower/GNUmakefile
@@ -2,11 +2,11 @@ depth = ..
 
 NAME = flower
 MODULE_NAME = flower
-SUBDIRS = include 
+SUBDIRS = include
 
-SCRIPTS = 
+SCRIPTS =
 README_FILES = NEWS-1.0 NEWS-1.1.46 README TODO
 EXTRA_DIST_FILES= VERSION $(README_FILES) $(SCRIPTS)
 STEPMAKE_TEMPLATES=library c++ po test
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 7fef97abfb2681116c0a2c02f1da7b05f84f417d..e77ca5ee0437f74f6cf21598c5398d7f63f8c8a7 100644 (file)
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -86,7 +86,35 @@ namespace std {
       return &(*this)[0];
     }
   };
+
+  /* FIXME: it appears that choosing this function is broken when stl
+     has no data () member too...  */
+  template<typename T>
+  void
+  binary_search_bounds (vector<T*> const &table,
+                       T const *key, int (*compare) (T *const &, T *const &),
+                       unsigned *lo,
+                       unsigned *hi)
+  {
+    int cmp;
+    int result;
+
+    /* binary search */
+    do
+      {
+       cmp = (*lo + *hi) / 2;
+
+       result = (*compare) ((T *) key, table[cmp]);
+
+       if (result < 0)
+         *hi = cmp;
+       else
+         *lo = cmp;
+      }
+    while (*hi - *lo > 1);
+  }
 }
+
 #endif /* !HAVE_STL_DATA_METHOD */
 
 namespace std {
@@ -163,18 +191,20 @@ namespace std {
   }
 
 #if 0
+  /* FIXME: what if COMPARE is named: int operator == (T const&, T const&),
+     wouldn't that work for most uses of BINARY_SEARCH?
+  */
   template<typename T>
   vsize
-  //  binary_search (std::vector<T> const &v,
   binary_search (vector<T> const &v,
                 T const &key, int (*compare) (T const &, T const &),
                 vsize b=0, vsize e=VPOS)
   {
-    //(void) compare;
     if (e == VPOS)
       e = v.size ();
     typename vector<T>::const_iterator i = find (v.begin () + b,
-                                                v.begin () + e, key);
+                                                v.begin () + e,
+                                                key);
     if (i != v.end ())
       return i - v.begin ();
     return VPOS;

diff --git a/input/GNUmakefile b/input/GNUmakefile
index 35d42859e9e18bf4d27db1ad6f5cebeb978c9f0b..8fa23d82758bc4cea0da298f151f283264aec79f 100644 (file)
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -1,10 +1,10 @@
 depth = ..
 
-SUBDIRS = test regression tutorial no-notation mutopia 
+SUBDIRS = test regression tutorial no-notation mutopia
 
 examples = typography-demo les-nereides wilhelmus proportional bach-schenker
 
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 EXTRA_DIST_FILES=paddy.abc
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make

diff --git a/input/mutopia/GNUmakefile b/input/mutopia/GNUmakefile
index c714662fab1d3a53e02e5bbdd9c717142956e16a..5c6839fccbb88e98e2bdf54dc8ed263451ed51a9 100644 (file)
--- a/input/mutopia/GNUmakefile
+++ b/input/mutopia/GNUmakefile
@@ -4,6 +4,6 @@ LOCALSTEPMAKE_TEMPLATES=ly mutopia
 EXTRA_DIST_FILES += claop.py
 SUBDIRS = J.S.Bach F.Schubert E.Satie  W.A.Mozart R.Schumann
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 

diff --git a/input/mutopia/W.A.Mozart/GNUmakefile b/input/mutopia/W.A.Mozart/GNUmakefile
index f4fc66c5e0e7d4d6610651e83649a7af09b9e85b..5a98a7a49a3f17e3642074b7b0c15e482f6f4e83 100644 (file)
--- a/input/mutopia/W.A.Mozart/GNUmakefile
+++ b/input/mutopia/W.A.Mozart/GNUmakefile
@@ -1,4 +1,4 @@
-# 
+#
 
 depth = ../../..
 

diff --git a/input/no-notation/GNUmakefile b/input/no-notation/GNUmakefile
index 7bdc0ec4401250a3ea82b9088accc80d28579713..daedbb1cc4b4f7ba24e484604c86f9b7668f8bfb 100644 (file)
--- a/input/no-notation/GNUmakefile
+++ b/input/no-notation/GNUmakefile
@@ -3,6 +3,6 @@ depth = ../..
 EXTRA_DIST_FILES=README
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 

diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile
index 01100469504fc73bcf3e832ab7349feb693d6486..15b634bccf7c1787763c9235b6d1becf904bd87b 100644 (file)
--- a/input/regression/GNUmakefile
+++ b/input/regression/GNUmakefile
@@ -3,7 +3,7 @@ depth = ../..
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 TITLE=LilyPond Regression Tests
 
 local-clean: local-delete

diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
index dfb075e6fa0beaecbb3e175b222bd8d1952d9293..7220ec4cff892494044dc3b7c3841fcf396d3578 100644 (file)
--- a/input/test/GNUmakefile
+++ b/input/test/GNUmakefile
@@ -7,10 +7,10 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
 ## Hmm, would this work?  No -- if we really want examples, move
 ## to other dir (input/) comes to mind.
 ## examples = font20 ancient-font
-## LOCALSTEPMAKE_TEMPLATES += ly mutopia 
+## LOCALSTEPMAKE_TEMPLATES += ly mutopia
 
 EXTRA_DIST_FILES= README
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 TITLE=LilyPond Tips and Tricks

diff --git a/input/tutorial/GNUmakefile b/input/tutorial/GNUmakefile
index 621b57756bc8d89709ceb8b56fac9458532ce2e9..a17e462bf5840c83787ac1875b182dfe1bfbcebc 100644 (file)
--- a/input/tutorial/GNUmakefile
+++ b/input/tutorial/GNUmakefile
@@ -4,6 +4,6 @@ LOCALSTEPMAKE_TEMPLATES=ly mutopia
 
 EXTRA_DIST_FILES= lbook-texi-test.texi  lbook-latex-test.tex
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 2a51dc0474283d7cb52f469e9869a32492fde5bd..4d596327b0902e926e8add1ce6916494986711b0 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -5,7 +5,7 @@ NAME = lilypond
 SUBDIRS = include
 
 MODULE_LIBS=$(depth)/flower
-MODULE_INCLUDES= $(depth)/flower/include 
+MODULE_INCLUDES= $(depth)/flower/include
 
 # need this to convert between function pointers and member function pointers.
 MODULE_CXXFLAGS= -Wno-pmf-conversions
@@ -17,7 +17,7 @@ STEPMAKE_TEMPLATES=c c++ executable po help2man
 # list parser.hh first: making parser.hh removes parser.cc
 OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 ifeq ($(HAVE_LIBKPATHSEA_SO),no)
 MODULE_LDFLAGS += $(KPATHSEA_LIBS)
@@ -44,12 +44,12 @@ $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
        $(MAKE) -C $(top-build-dir)/Documentation/pictures
 
 $(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
-       cp $< $@ 
+       cp $< $@
 $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
        $(MAKE) -C $(top-build-dir)/Documentation/pictures
 
 $(outdir)/ly.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico
-       cp $< $@ 
+       cp $< $@
 endif
 
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'

diff --git a/lily/source-file.cc b/lily/source-file.cc
index d9c022b1579e5961fc02717065ca2766743b745e..9689b1a29e19f3bfb68930dd63c367b3731ef03a 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -323,7 +323,7 @@ Source_file::get_line (char const *pos_str0) const
     return hi;
 
   binary_search_bounds (newline_locations_,
-                       (char const*)pos_str0,
+                       (char const*&)pos_str0,
                        default_compare,
                        &lo, &hi);
 

diff --git a/ly/GNUmakefile b/ly/GNUmakefile
index 93c085d46e13bd867d9329ac26f2b2d56111fed5..ba9200edecc3bf1e1c976817c94443ca3e439568 100644 (file)
--- a/ly/GNUmakefile
+++ b/ly/GNUmakefile
@@ -7,7 +7,7 @@ INSTALLATION_DIR=$(local_lilypond_datadir)/ly/
 INSTALLATION_FILES=$(INI_FILES)
 
 STEPMAKE_TEMPLATES=install
-LOCALSTEPMAKE_TEMPLATES=ly 
+LOCALSTEPMAKE_TEMPLATES=ly
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 

diff --git a/make/GNUmakefile b/make/GNUmakefile
index b22d727ae215d615d6652924af475fbc0d7d1956..1f26abcd58264f10892eb78c30d8b90d39cc1aaa 100644 (file)
--- a/make/GNUmakefile
+++ b/make/GNUmakefile
@@ -2,7 +2,7 @@ depth = ..
 
 STEPMAKE_TEMPLATES=makedir install
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 default: spec
 

diff --git a/make/generic-vars.make b/make/generic-vars.make
index a1c15f8b0d14a5de5cf4855558100e648556881e..652bdd11a197e246e5ca10f9f4e87baa528ecbae 100644 (file)
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -1,11 +1,11 @@
 # title           package specific variables
 # file    make/Variables.make
 #
-# do not change this file for site-wide extensions; please use 
-# make/$(outdir)/Site.make; 
+# do not change this file for site-wide extensions; please use
+# make/$(outdir)/Site.make;
 #
-# Any change in files in this directory (make/) would be distributed, if 
-# you do make dist 
+# Any change in files in this directory (make/) would be distributed, if
+# you do make dist
 #
 
 buildscript-dir = $(src-depth)/buildscripts
@@ -20,7 +20,7 @@ make-dir = $(src-depth)/make
 include-flower = $(src-depth)/flower/include
 
 
-LILYPOND_INCLUDES = $(include-flower) $(depth)/flower/$(outdir) 
+LILYPOND_INCLUDES = $(include-flower) $(depth)/flower/$(outdir)
 
 
 # should use to create .spec ?

diff --git a/make/lilypond-targets.make b/make/lilypond-targets.make
index a894b28fb0f5fc766ef6f9e4702ccc224f2f71de..637549ecc1207cac14a791cd434963a24f837f64 100644 (file)
--- a/make/lilypond-targets.make
+++ b/make/lilypond-targets.make
@@ -1,6 +1,6 @@
 #empty
 
 
-## TODO: fail dist or web if no \version present. 
+## TODO: fail dist or web if no \version present.
 check-version:
-       grep -L version $(LY_FILES) 
+       grep -L version $(LY_FILES)

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 1a87a795cf9ef2cc6a96e3734103d74893d3beaf..b3c4f4108c1fad05886c37b258db026866dfd0f0 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -35,7 +35,7 @@ $(outdir)/%.pdf.omf: %.tely
        $(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: %.tely
-       $(call GENERATE_OMF,ps.gz) 
+       $(call GENERATE_OMF,ps.gz)
 
 $(outdir)/%.html.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,html)
@@ -44,4 +44,4 @@ $(outdir)/%.pdf.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-       $(call GENERATE_OMF,ps.gz) 
+       $(call GENERATE_OMF,ps.gz)

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index f3bc79bd6a015aade8df7a8c658f90b46b50b12c..cbacdaa0c7ab74e16abf2497e8664408b4692274 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -11,14 +11,14 @@ $(outdir)/%.ly.txt: %.abc
        ln -f $< $@
 
 $(outdir)/%.ly: %.abc
-       $(PYTHON) $(ABC2LY) --strict -o $@ $< 
+       $(PYTHON) $(ABC2LY) --strict -o $@ $<
 
-# hmm. notdir builds src-dir builds? 
+# hmm. notdir builds src-dir builds?
 $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
        cd $(outdir); $(LILYPOND_BINARY) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(shell pwd)/ $(notdir $<)
        touch $(outdir)/$(basename $(notdir $<)).png
 
 $(outdir)/%.ly: %.ly
-       cp $< $@ 
+       cp $< $@
 
 

diff --git a/make/stepmake.make b/make/stepmake.make
index 2757da6a507a19eeb6274091441e818599e83012..14d357cc8f40413ae0fec74343028509bf2ffc1b 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -30,7 +30,7 @@ $(MAKE_TARGETS): scons
 scons:
        @echo "warning: $(SCONS_USER) detected, rerouting to scons"
        cd $(depth) && scons $(here) $(MAKECMDGOALS)
-       false 
+       false
 endif
 endif
 
@@ -75,7 +75,7 @@ BUILD_VERSION=1
 
 outdir=$(outroot)/$(outbase)
 
-# why not generic ?? 
+# why not generic ??
 config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh
 
 # The outdir that was configured for: best guess to find binaries
@@ -87,7 +87,7 @@ stepdir = $(stepmake)/stepmake
 # for stepmake package
 # stepdir = $(depth)/stepmake
 
-STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
+STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES)
 LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 
 # Don't try to outsmart us, you puny computer!
@@ -109,11 +109,11 @@ all:
 
 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
 
-# ugh. need to do this because of PATH :=$(top-src-dir)/..:$(PATH) 
-include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) 
+# ugh. need to do this because of PATH :=$(top-src-dir)/..:$(PATH)
+include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES)))
 
 
-include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) 
-include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) 
-include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) 
-include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES))) 
+include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES)))
+include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES)))
+include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES)))
+include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES)))

diff --git a/make/toplevel-version.make b/make/toplevel-version.make
index 33b61b4ed13cf3aec47d26a54d6bb59ec14c2671..176ad185d143d4863cce2c815f0bf640a2d152a9 100644 (file)
--- a/make/toplevel-version.make
+++ b/make/toplevel-version.make
@@ -1,6 +1,6 @@
 # Toplevel_version.make
 
-ifeq ($(configure-srcdir), .) 
+ifeq ($(configure-srcdir), .)
 include $(depth)/VERSION
 else
 include $(configure-srcdir)/VERSION

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index ae1bce56016109946a7a9f7f4a73f946497542ea..8ff1afa9baecd0e3647727b1b241a2c8dbb6ff42 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -3,7 +3,7 @@ depth = ..
 STEPMAKE_TEMPLATES=metafont install install-out
 LOCALSTEPMAKE_TEMPLATES=lilypond
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 AF_FILES = $(call src-wildcard,*.af)
 
@@ -116,7 +116,7 @@ $(outdir)/$(PFA_PREFIX)emmentaler-23.otf $(outdir)/$(PFA_PREFIX)emmentaler-23.pf
 $(outdir)/$(PFA_PREFIX)emmentaler-26.otf $(outdir)/$(PFA_PREFIX)emmentaler-26.pfa: $(outdir)/feta26.pfa $(outdir)/feta-alphabet26.pfa $(outdir)/parmesan26.pfa
 
 
-$(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) 
+$(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst feta,parmesan,$<))
        cat $< \
                $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
                $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
@@ -126,8 +126,8 @@ $(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa: $(outdir)/aybabtu.subf
 $(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa)
 
 $(outdir)/aybabtu.fontname:
-       echo -n 'aybabtu' > $@ 
-$(outdir)/aybabtu.subfonts: 
+       echo -n 'aybabtu' > $@
+$(outdir)/aybabtu.subfonts:
        echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
 $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
@@ -145,16 +145,16 @@ install-fc-cache:
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES)
 
-# Make tfm files first, log files last, 
+# Make tfm files first, log files last,
 # so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(NCSB_TTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1 
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(NCSB_TTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
 INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 
+INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
 
 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
@@ -222,11 +222,11 @@ $(outdir)/$(redhat-package):
        wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package)
 
 get-rpm-fonts: $(outdir)/$(redhat-package)
-       cd $(outdir) ; rm -rf usr/ # (root alert!) 
+       cd $(outdir) ; rm -rf usr/ # (root alert!)
        cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg'
        cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
 
-# change this dependency 
+# change this dependency
 get-fonts: get-rpm-fonts
 get-pfa: get-rpm-fonts
 
@@ -240,7 +240,7 @@ fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.s
 
 
 local-clean:
-       rm -f mfplain.mem mfplain.log 
+       rm -f mfplain.mem mfplain.log
        rm -f *.tfm *.log
 
 $(outdir)/%.enc.in: %.enc

diff --git a/po/GNUmakefile b/po/GNUmakefile
index e6905f1b66606c5d0aba266d1cbbac915c312bad..a9b8f72c5da6a985a615027b3b670c699646d398 100644 (file)
--- a/po/GNUmakefile
+++ b/po/GNUmakefile
@@ -1,5 +1,5 @@
 # title           makefile for po
-# file    po/Makefile 
+# file    po/Makefile
 
 depth = ..
 
@@ -10,11 +10,11 @@ POT_FILES = $(call src-wildcard,*.pot)
 PO_FILES = $(call src-wildcard,*.po)
 MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo))
 HELP_CATALOGS = $(PO_FILES:%.po=%)
-CATALOGS = $(HELP_CATALOGS:lilypond=) 
+CATALOGS = $(HELP_CATALOGS:lilypond=)
 EXTRA_DIST_FILES = TODO $(PO_FILES) $(POT_FILES)
 STEPMAKE_TEMPLATES=podir
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 default: $(MO_FILES)
 

diff --git a/ps/GNUmakefile b/ps/GNUmakefile
index b7defdfefe8ff7318e911c7dff69e912f8e36129..d05179fd4ed718512dc73bfb70cd207c9ac852d4 100644 (file)
--- a/ps/GNUmakefile
+++ b/ps/GNUmakefile
@@ -3,7 +3,7 @@ depth = ..
 PS_FILES = $(call src-wildcard,*.ps)
 
 STEPMAKE_TEMPLATES=install
-EXTRA_DIST_FILES = $(PS_FILES) 
+EXTRA_DIST_FILES = $(PS_FILES)
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/ps/
 INSTALLATION_FILES=$(PS_FILES)

diff --git a/scm/GNUmakefile b/scm/GNUmakefile
index bf2c2e043165521c79d3d51141035cdb1537e4b9..fb01bcfbd55be2076198842e5cd9a5ae036dfcd7 100644 (file)
--- a/scm/GNUmakefile
+++ b/scm/GNUmakefile
@@ -8,5 +8,5 @@ INSTALLATION_FILES=$(SCM_FILES)
 XGETTEXT_FLAGS = --language=Lisp
 STEPMAKE_TEMPLATES=install scm po
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index cfa46960c6eb0b09882d7d4e6e27b146e042d173..837f39eb4100ac22b4f2f1226e700f955c2685df 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -6,7 +6,7 @@ STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond
 HELP2MAN_EXECS = $(SEXECUTABLES)
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 include $(stepdir)/executable-targets.make
 
 

diff --git a/stepmake/GNUmakefile b/stepmake/GNUmakefile
index 0ea8a623c888d0f68f466e266a7d8fbbd36b3262..7d11336ea7ee2aad9a3a8d4695b8498745f1b404 100644 (file)
--- a/stepmake/GNUmakefile
+++ b/stepmake/GNUmakefile
@@ -7,21 +7,21 @@ depth = ..
 
 # descent order into subdirectories:
 #
-SUBDIRS = bin stepmake 
+SUBDIRS = bin stepmake
 
 # list of distribution files:
 #
 SCRIPTS =  aclocal.m4 autogen.sh
 README_FILES = CHANGES README TODO
-README_TXT_FILES = 
-EXTRA_DIST_FILES = $(README_FILES)  $(SCRIPTS) 
+README_TXT_FILES =
+EXTRA_DIST_FILES = $(README_FILES)  $(SCRIPTS)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 #
 
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES= texinfo
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 # don't install stepmake
 install: local-install

diff --git a/stepmake/bin/GNUmakefile b/stepmake/bin/GNUmakefile
index c5da573a947e962ab058e065164d42d812f546fc..13b4d2ad37260891b4112b470f4c4c8de8b6c64c 100644 (file)
--- a/stepmake/bin/GNUmakefile
+++ b/stepmake/bin/GNUmakefile
@@ -4,7 +4,7 @@ depth = ../..
 EXTRA_DIST_FILES = install-sh config.sub config.guess
 STEPMAKE_TEMPLATES=script install
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 POST_INSTALL=chmod 755 $(datadir)/bin/*
 INSTALLATION_DIR=$(datadir)/bin

diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile
index a2336555bd2bd52eeb31c1aa22d1dcf552b17cce..5905642e3f1407866cdaccbe808d952f3836f330 100644 (file)
--- a/stepmake/stepmake/GNUmakefile
+++ b/stepmake/stepmake/GNUmakefile
@@ -14,7 +14,7 @@ STEPMAKE_TEMPLATES=makedir install www
 
 # bootstrap stepmake:
 #
--include $(depth)/make/stepmake.make 
+-include $(depth)/make/stepmake.make
 
 ifeq ($(PACKAGE),STEPMAKE)
 INSTALLATION_DIR=$(datadir)/stepmake

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 061f6305d8fd92d6a69bf029a94f1db67be10d31..2e1578c1774f670e335e58e5f56a9b3182b2526e 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -22,10 +22,10 @@ $(outdir)/%.hh: %.yy
        -mv -f $(outdir)/$(*F).cc.h $@  # bison < 1.30
        -mv $(*F).tab.hh $@
        rm -f $(*F).tab.c $(*F).tab.cc # bison < 1.30
-       rm -f $(outdir)/$(*F).cc # avoid recompiling the .cc file 
+       rm -f $(outdir)/$(*F).cc # avoid recompiling the .cc file
 
 $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -o$@ $< 
+       $(FLEX) -Cfe -p -p -o$@ $<
 
 $(outdir)/%-rc.o: $(outdir)/%.rc
        $(WINDRES) $(WINDRES_FLAGS) -o$@ $<

diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
index 955d5d3773e9ce3f4bd36bcc8be647a5edc17cc8..fdc8b57af4d9c00dba5460dd83c0e821bf13413f 100644 (file)
--- a/stepmake/stepmake/c++-vars.make
+++ b/stepmake/stepmake/c++-vars.make
@@ -18,7 +18,7 @@ LL_FILES := $(call src-wildcard,*.ll)
 
 SOURCE_FILES+= $(CC_FILES) $(YY_FILES) $(INL_FILES) $(TCC_FILES) $(HH_FILES) $(LL_FILES)
 
-ALL_CC_SOURCES += $(HH_FILES) $(INL_FILES) $(CC_FILES) $(YY_FILES) $(LL_FILES) 
+ALL_CC_SOURCES += $(HH_FILES) $(INL_FILES) $(CC_FILES) $(YY_FILES) $(LL_FILES)
 
 O_FILES+=$(addprefix $(outdir)/, $(CC_FILES:.cc=.o) $(LL_FILES:.ll=.o) $(YY_FILES:.yy=.o))
 

diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index d6d6a9b36dca995054d655829e55126ea9a16611..620275baa177e67313535571393c21d85e90e205 100644 (file)
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -19,12 +19,12 @@ $(outdir)/%.c: %.y
 $(outdir)/%.h: %.y
        $(BISON) -d $<
        mv $(*F).tab.h $@
-       rm -f $(*F).tab.c # if this happens in the wrong order it triggers recompile of the .cc file 
+       rm -f $(*F).tab.c # if this happens in the wrong order it triggers recompile of the .cc file
 
 $(outdir)/%.c: %.l
        $(FLEX) -Cfe -p -p -o$@ $<
 # could be faster:
-#      $(FLEX) -8 -Cf -o$@ $< 
+#      $(FLEX) -8 -Cf -o$@ $<
 
 $(outdir)/%.rc.o: $(outdir)/%.rc
        $(WINDRES) $(WINDRES_FLAGS) -o$@ $<

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index 02765c7a02216f93a324c40b0b8de723e8eb8d8e..8bcb8223fc018a0bc08e07e5dfb67ccd338b1b12 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -1,5 +1,5 @@
 # do we need this?
 default:
 
-local-WWW: $(OUTHTML_FILES) 
+local-WWW: $(OUTHTML_FILES)
 

diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index d2950ed0cdfd372cc2ef8d657dbed3fb9555bf1a..f82ab99a72db6a1493e7ec09ecf4b34372da8dce 100644 (file)
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -1,6 +1,6 @@
 
-define MODULE_LIB_template \
-$(1)/$(outdir)/library.a : \
+define MODULE_LIB_template
+$(1)/$(outdir)/library.a :
        $(MAKE) -C $(1)
 endef
 

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index a196a357bc0e5d4ac6ac50a4f418da910e1ab154..39088178492979052d016b16dcc7f1661de615c6 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -14,14 +14,14 @@ clean: local-clean
 
 ifneq ($(strip $(depth)),.)
 dist:
-       make -C $(depth) dist
+       $(MAKE) -C $(depth) dist
 endif
 
-distclean: clean 
+distclean: clean
        $(LOOP)
        $(MAKE) local-distclean
 
-maintainerclean: 
+maintainerclean:
        $(LOOP)
        $(MAKE) local-maintainerclean
        $(MAKE) local-distclean
@@ -133,7 +133,7 @@ local-uninstall:
 
 installextradoc:
        -$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
-       cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package) 
+       cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package)
 
 include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 
@@ -164,7 +164,7 @@ diff:
        $(PYTHON) $(step-bindir)/package-diff.py  --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir) $(makeflags)
        -ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
 
-release: 
+release:
        $(PYTHON) $(step-bindir)/release.py --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir)
 
 
@@ -180,6 +180,6 @@ WWW: local-WWW
 WWW-post: local-WWW-post
        $(LOOP)
 
-web: 
+web:
        $(MAKE) out=www WWW
        $(MAKE) out=www WWW-post

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 180d8a93fc40600f0970327abefe6f336b684eca..6766ee9166de8b58ec943f03812e654b98a4a7af 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -79,14 +79,14 @@ DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SC
 DOCDIR=$(depth)/$(outdir)
 
 #?
-STRIPDEBUG=true 
+STRIPDEBUG=true
 STRIP=strip --strip-debug
 DO_STRIP=true
 
 LOOP=$(foreach i,  $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C $(i) $@ &&) true
 
 ETAGS_FLAGS =
-CTAGS_FLAGS = 
+CTAGS_FLAGS =
 
 makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
 

diff --git a/stepmake/stepmake/help2man-vars.make b/stepmake/stepmake/help2man-vars.make
index 40ead12d532421a2f0b5bd715d1529e6a2d06de5..a212a34b6d9b75f49bc43607bcbcc4ed5199f6d6 100644 (file)
--- a/stepmake/stepmake/help2man-vars.make
+++ b/stepmake/stepmake/help2man-vars.make
@@ -3,5 +3,5 @@ ifneq ($(strip $(DOCUMENTATION)),no)
 HELP2MAN_GROFFS = $(addsuffix .1, $(addprefix $(outdir)/, $(HELP2MAN_EXECS)))
 
 # triggers recompilations.  Ugh.
-OUT_DIST_FILES +=  # $(wildcard $(outdir)/*.1) 
+OUT_DIST_FILES +=  # $(wildcard $(outdir)/*.1)
 endif

diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
index 0892bc085ac032b226465a44fb3e88d492cc8ea0..6729307ecf8adc1ff1993e2c950f23c5a667e2ef 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -12,7 +12,7 @@ local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION
                ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ || true) && \
                $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES$(suff)) $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ && ) true
 
-local-uninstall: local-uninstall-outfiles local-uninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
 local-uninstall-files:
 

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index c13a4cc779c34bbbd0812cb86f24a04f09a60dbf..f06ceadbe69f480a9c51dcba90bbecf279993793 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -10,10 +10,10 @@ local-install-files: $(INSTALLATION_FILES)
        $(INSTALLPY) -m 644 $(addprefix $(src-dir)/,$(INSTALLATION_FILES)) $(DESTDIR)$(INSTALLATION_DIR)/
        $(foreach suff, $(INSTALLATION_SUFFIXES),  \
                ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
-               $(INSTALLPY) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ ) 
+               $(INSTALLPY) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ )
        $(POST_INSTALL)
 
-local-uninstall: local-uninstall-outfiles local-uninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
 local-uninstall-outfiles:
 

diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make
index 0145a270bb0d447ece48d76ffefea8e6cf8549ab..7a78a593448218afe8e630ed424606d83c7023e8 100644 (file)
--- a/stepmake/stepmake/makedir-vars.make
+++ b/stepmake/stepmake/makedir-vars.make
@@ -9,7 +9,7 @@ OUT_DIST_FILES= $(strip $(OUTLSM_FILES) $(OUTSPEC_FILES))
 
 EXTRA_DIST_FILES += $(MAKE_FILES)
 
-# these two outdir FILES are distributed, since they make sense to have 
+# these two outdir FILES are distributed, since they make sense to have
 # without running configure and make.
 
 at-dir = $(doc-dir)/

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index cd61be5907b468ddfb2e42afb9d994299d244078..2ccf2f7b2c3319998a4cfe823c63179d9003223b 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -18,7 +18,7 @@ $(outdir)/%.tfm $(outdir)%.log: %.mf
        MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
 # Let's keep this log output, it saves another mf run.
        mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
-       rm $(basename $(@F)).*gf 
+       rm $(basename $(@F)).*gf
 
 $(outdir)/%.$(XPM_RESOLUTION)gf: %.mf
        MFINPUTS=$(src-dir) $(METAFONT) "\\mode=$(XPM_MODE); \\input $<"

diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make
index 38a9322a04df7bff966e463b7f10ab37c3c65d08..3bf28cab83988ea0cb20ccff792bc5d53dff20a9 100644 (file)
--- a/stepmake/stepmake/metapost-rules.make
+++ b/stepmake/stepmake/metapost-rules.make
@@ -1,6 +1,6 @@
 # Don't remove $(outdir)/.log's.  Logs are a target!
 
-$(outdir)/%.0: %.mf $(outdir)/mfplain.mem  
+$(outdir)/%.0: %.mf $(outdir)/mfplain.mem
        -$(METAPOST) "&$(outdir)/mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<"
 
 $(outdir)/mfplain.mem: $(MFPLAIN_MP)

diff --git a/stepmake/stepmake/metapost-targets.make b/stepmake/stepmake/metapost-targets.make
index 66d57a847d6d15e6c81fb88f88b41642035312f2..d976642f23e0737e79e36b5ebaa9a1ba49b6a99b 100644 (file)
--- a/stepmake/stepmake/metapost-targets.make
+++ b/stepmake/stepmake/metapost-targets.make
@@ -1,2 +1,2 @@
 
-pfa: $(PFA_FILES) 
+pfa: $(PFA_FILES)

diff --git a/stepmake/stepmake/omf-vars.make b/stepmake/stepmake/omf-vars.make
index cc305e0087e6049c958b8c34bb698b2970eb1e45..45157eaad40d21fc89f40e43a14c28aa6a1ed22b 100644 (file)
--- a/stepmake/stepmake/omf-vars.make
+++ b/stepmake/stepmake/omf-vars.make
@@ -2,4 +2,4 @@
 #empty
 #
 
-OMF_FILES += 
+OMF_FILES +=

diff --git a/stepmake/stepmake/pod-rules.make b/stepmake/stepmake/pod-rules.make
index d0b4628b4c748f026cc1472ad35998c00189ccc1..884273625938165f006c9bcd6c81f9d2909038f9 100644 (file)
--- a/stepmake/stepmake/pod-rules.make
+++ b/stepmake/stepmake/pod-rules.make
@@ -13,8 +13,8 @@ POD2HTML_5004=$(POD2HTML) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/a
 
 do_pod2html=$($(POD2HTML_VERSION))
 
-$(outdir)/%.html: $(outdir)/%.pod 
-       $(do_pod2html) 
+$(outdir)/%.html: $(outdir)/%.pod
+       $(do_pod2html)
 
 $(outdir)/%.pod: %.pod
        cp $< $@

diff --git a/stepmake/stepmake/shared-library-vars.make b/stepmake/stepmake/shared-library-vars.make
index e638ec5ccd1defe25f92850f50d3acbf00dde858..8b9ccbcd9e9dccfb3abbe79e74060a2f9ddfbe5d 100644 (file)
--- a/stepmake/stepmake/shared-library-vars.make
+++ b/stepmake/stepmake/shared-library-vars.make
@@ -7,7 +7,7 @@ ifeq ($(CYGWIN_BUILD)$(MINGW_BUILD),)
 else
 ifneq ($(CYGWIN_BUILD),)
   SHARED_LIB_PREFIX = cyg
-  SHARED_LIB_SUFFIX = 
+  SHARED_LIB_SUFFIX =
   SHARED_LIB_VERSION = $(subst .,-,$(VERSION))
   SHARED_LIB_VERSION_SUFFIX = .dll
 #  ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
@@ -15,7 +15,7 @@ ifneq ($(CYGWIN_BUILD),)
 endif
 ifneq ($(MINGW_BUILD),)
   SHARED_LIB_PREFIX = lib
-  SHARED_LIB_SUFFIX = 
+  SHARED_LIB_SUFFIX =
   SHARED_LIB_VERSION = $(subst .,-,$(VERSION))
   SHARED_LIB_VERSION_SUFFIX = .dll
 ##  ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a

diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index ad63c0f7e6fe8608634449e26597bca595c624ec..fc330548f654bef8bc67263615d83ce242ad28e7 100644 (file)
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -1,5 +1,5 @@
 
-# config_make dep isn't working. Why?  
+# config_make dep isn't working. Why?
 $(outdir)/%: %.in $(config_make) $(depth)/VERSION
        rm -f $@
        cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@

diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index 254a96e0bacf758920c71840aafcaa3aadce7b11..6751e5da9a03b292ae95b1535bcdbb0053d99928 100644 (file)
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -31,6 +31,6 @@ $(outdir)/%.pdf: $(outdir)/%.dvi
 
 
 # without -dSAFER
-# gs 8.15 complains of safety of loading a ttf directly 
+# gs 8.15 complains of safety of loading a ttf directly
 
 

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 874cc7fe30fb1b822f4b7ba6191cea126e5f6b7a..3f0432b2e136db706615b34c21bddd36c367e82a 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -14,10 +14,10 @@ $(outdir)/%.pdf.omf: %.texi
        $(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: %.texi
-       $(call GENERATE_OMF,ps.gz) 
+       $(call GENERATE_OMF,ps.gz)
 
 # Generic rule not possible?
-$(outdir)/%/%.html: $(outdir)/%.texi 
+$(outdir)/%/%.html: $(outdir)/%.texi
        $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 
 

diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make
index 4297e3885777c0c6f06fdb93c3e949da90557365..bfe076893fd12d62f7d2e7f39aa27a24befd11d7 100644 (file)
--- a/stepmake/stepmake/topdocs-targets.make
+++ b/stepmake/stepmake/topdocs-targets.make
@@ -1,5 +1,5 @@
 
-default: local-doc 
+default: local-doc
 
 copy-to-top:  $(TO_TOP_FILES)
        $(foreach i, $(TO_TOP_FILES), \

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index c59d971b855e870bbe0c5252d70262701eaff075..01b220c890cd7d6435fb3d8893c5f0baa383788f 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -1,8 +1,8 @@
 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
@@ -48,7 +48,7 @@ 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?

diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make
index 6ab5a4ed163c7e658caad173a2e26523cca2c4b3..e260f4b97b1746713db91cf34fb051cd55833e51 100644 (file)
--- a/stepmake/stepmake/toplevel-vars.make
+++ b/stepmake/stepmake/toplevel-vars.make
@@ -1,6 +1,6 @@
 
 # override Generic_vars.make:
-DIST_FILES := $(EXTRA_DIST_FILES) 
+DIST_FILES := $(EXTRA_DIST_FILES)
 
 # urg?
 include $(stepdir)/documentation-vars.make

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 8ebe0f5f956d0da7f1f72f6e222616ac09745c2d..b05ec0e3c7c42c52e3de3574d5ec6754badd4ed4 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -16,7 +16,7 @@ LILYPOND_WORDS_DEPENDS =\
 STEPMAKE_TEMPLATES=install-out
 
 # vimdir defined in config.make
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 local-install:
        for a in compiler ftdetect ftplugin indent syntax; do \
@@ -30,7 +30,7 @@ local-uninstall:
                -rmdir -p $(DESTDIR)$(vimdir)/$$a ; \
        done
 
-$(LILYPOND_WORDS): 
+$(LILYPOND_WORDS):
        cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
 
 all: $(LILYPOND_WORDS)