* Backport:

* cygwin/mknetrel: Exit if doc build fails.

* lily/GNUmakefile: Add hack for .deps and --srcdir build.

* lily/lexer.ll:
* lily/include/my-lily-lexer.hh:
* lily/include/includable-lexer.hh: Add flex kludge.

diff --git a/ChangeLog b/ChangeLog
index f073de3673bc993ff87779afeb80f0f1e3544188..403a7183172ca69823d9595d95d6f3b6d9dda020 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Backport:
+
+       * cygwin/mknetrel: Exit if doc build fails.
+
+       * lily/GNUmakefile: Add hack for .deps and --srcdir build.
+       
+       * lily/lexer.ll: 
+       * lily/include/my-lily-lexer.hh: 
+       * lily/include/includable-lexer.hh: Add flex kludge.
+
 2003-02-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION: 1.6.8 released

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index b2f32622b260b59a43ee53d74c3c60a2a2c5a54d..5968d5ac4f6b49698dc43c9350cfe3605c8fb920 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -10,7 +10,7 @@
 # To use this, do something like:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.6/lilypond-1.6.3.tar.gz
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.6/lilypond-1.6.8.tar.gz
    rm -rf /home/netrel/src/lilypond-*
    mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
@@ -30,6 +30,7 @@ if iscygwin; then
     true
 else    
     uploads=$here/uploads/$base && mkdir -p $uploads
+    ##uploads=$here/uploads-development/$base && mkdir -p $uploads
     tarstem=$uploads/$package
 fi
 
@@ -295,7 +296,9 @@ prebuild () {
     cd $src && ln -s GNUmakefile.in GNUmakefile
 
     cd $build || exit 1
-    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc
+    # Ugh.  Fixed in 1.6.8CVS and 1.7.13CVS.
+    # PATH=/bin:/usr/bin:$PATH make DO_O_DEP="echo NO DEPS;" conf=for-build all doc html-doc || exit 1
+    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1
     for i in $(find . -path "out-for-build/*.1"); do
        cp -pv $i $(dirname $(dirname $i))/$(basename $i)
     done

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 79a516e0b247b2588e34ec22d15bfe05b5ba7daf..e1be486358a30798bd72dcaf55e212f9b1b435b9 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -21,7 +21,7 @@ include $(depth)/make/stepmake.make
 
 ETAGS_FLAGS += -r '/^LY_DEFINE *(\([^,]+\),/\1/'  -r '/^LY_DEFINE *([^,]+, *"\([^"]+\)"/\1/' 
 
-default: 
+default:
 
 # force these: Make can't know these have to be generated in advance
 $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
@@ -31,3 +31,9 @@ $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
+
+# ugh.  For --srcdir builds, these must exist to satisfy their broken
+# lexer.dep and parser.dep file entries.
+ifneq ($(srcdir), .)
+.PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
+endif

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index adff5283bdd037814c1ce90854c43e21b234aa01..a05d707b0d41e74b850f7cc8f229032c6102b919 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -10,6 +10,7 @@
 #ifndef INCLUDABLE_LEXER_HH
 #define INCLUDABLE_LEXER_HH
 
+using namespace std;
 #include <FlexLexer.h>
 
 #include "string.hh"

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index 8bdcd6ee47fbd39a36092d9945acd8fd08f67ba1..57f16857fcd2ae71d9e10862d9a14e542a6c3584 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -9,6 +9,7 @@
 #ifndef LEXER_HH
 #define LEXER_HH
 
+using namespace std;
 #include <FlexLexer.h>
 
 #include "dictionary.hh"

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 48d8c3564048cdac9e594947b7161ebfac8c5bd8..02ec7446655c2085abc620569402d96efda68e1a 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -27,6 +27,7 @@
 #include <errno.h>
 
 #include <iostream>
+using namespace std;
 
 #include "parse-scm.hh"
 #include "score.hh"