CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/14 23:58:43
Modified files:
. : ChangeLog config.make.in configure.in
Documentation/topdocs: INSTALL.texi
lily : GNUmakefile
stepmake : aclocal.m4
Log message:
* Documentation/topdocs/INSTALL.texi (Top): remove Flex
requirement.
* stepmake/aclocal.m4: STEPMAKE_FLEXLEXER_LOCATION: new
function. Figure out where FlexLexer.h lives
* lily/GNUmakefile (OUT_DIST_FILES): dist lexer.cc and FlexLexer.h
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3613&tr2=1.3614&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.make.in.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/configure.in.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/INSTALL.texi.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/GNUmakefile.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.143&tr2=1.144&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3613 lilypond/ChangeLog:1.3614
--- lilypond/ChangeLog:1.3613 Sat May 14 21:43:04 2005
+++ lilypond/ChangeLog Sat May 14 23:58:42 2005
@@ -1,3 +1,13 @@
+2005-05-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * Documentation/topdocs/INSTALL.texi (Top): remove Flex
+ requirement.
+
+ * stepmake/aclocal.m4: STEPMAKE_FLEXLEXER_LOCATION: new
+ function. Figure out where FlexLexer.h lives
+
+ * lily/GNUmakefile (OUT_DIST_FILES): dist lexer.cc and FlexLexer.h
+
2005-05-14 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* scripts/lilypond-invoke-editor.scm (dissect-uri): Handle URIs
Index: lilypond/Documentation/topdocs/INSTALL.texi
diff -u lilypond/Documentation/topdocs/INSTALL.texi:1.152
lilypond/Documentation/topdocs/INSTALL.texi:1.153
--- lilypond/Documentation/topdocs/INSTALL.texi:1.152 Wed May 11 21:55:28 2005
+++ lilypond/Documentation/topdocs/INSTALL.texi Sat May 14 23:58:43 2005
@@ -82,13 +82,6 @@
(version 1.6.5 or newer). If you are installing binary packages, you
may need to install guile-devel or guile-dev or libguile-dev too.
[EMAIL PROTECTED] @uref{http://www.gnu.org/software/flex/,Flex} (version 2.5.4a
or newer).
-
-WARNING: plain Flex 2.5.4(a) generates invalid C++ code. GCC 3.x
-chokes on this. If you wish to use GCC 3.x, make sure that your
-distribution supports g++ 3.x and flex. For workarounds, see
-lexer-gcc-3.1.sh in the source directory.
-
@item @TeX{}.
@TeX{} is used as an optional output backend.
Index: lilypond/config.make.in
diff -u lilypond/config.make.in:1.79 lilypond/config.make.in:1.80
--- lilypond/config.make.in:1.79 Thu May 12 11:32:49 2005
+++ lilypond/config.make.in Sat May 14 23:58:42 2005
@@ -111,3 +111,4 @@
WINDRES = @WINDRES@
YACC = @YACC@
ZIP = @ZIP@
+FLEXLEXER_PATH = @FLEXLEXER_PATH@
Index: lilypond/configure.in
diff -u lilypond/configure.in:1.152 lilypond/configure.in:1.153
--- lilypond/configure.in:1.152 Thu May 12 11:32:49 2005
+++ lilypond/configure.in Sat May 14 23:58:42 2005
@@ -44,6 +44,7 @@
STEPMAKE_BISON(OPTIONAL, 1.29)
STEPMAKE_FLEX(REQUIRED)
STEPMAKE_FLEXLEXER(REQUIRED)
+STEPMAKE_FLEXLEXER_LOCATION
AC_LANG_C
STEPMAKE_LOCALE
STEPMAKE_GETTEXT
@@ -91,6 +92,7 @@
# guile executable for some scripts
STEPMAKE_GUILE(OPTIONAL)
+
# perl for help2man.
STEPMAKE_PERL(OPTIONAL)
@@ -100,7 +102,6 @@
# makeinfo -- but hopefully won't report makeinfo problems.
STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
-
if test "$optimise_b" = yes; then
DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
AC_DEFINE(STRINGS_UTILS_INLINED)
@@ -111,7 +112,6 @@
# Gather requirements and generate output.
STEPMAKE_END
-
test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
cat <<EOF
Index: lilypond/lily/GNUmakefile
diff -u lilypond/lily/GNUmakefile:1.46 lilypond/lily/GNUmakefile:1.47
--- lilypond/lily/GNUmakefile:1.46 Fri May 13 15:45:33 2005
+++ lilypond/lily/GNUmakefile Sat May 14 23:58:43 2005
@@ -11,7 +11,7 @@
HELP2MAN_EXECS = lilypond
STEPMAKE_TEMPLATES=c c++ executable po help2man
-OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh)
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh FlexLexer.h lexer.cc)
include $(depth)/make/stepmake.make
@@ -44,9 +44,14 @@
# force these: Make can't know these have to be generated in advance
$(outdir)/lily-parser.o: $(outdir)/parser.hh
-$(outdir)/lily-lexer.o: $(outdir)/parser.hh
+$(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
$(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
+$(outdir)/FlexLexer.h: $(FLEXLEXER_PATH)/FlexLexer.h
+ cp $< $@
+
+
+
$(outdir)/general-scheme.o: $(outdir)/version.hh
$(outdir)/kpath.o: $(outdir)/version.hh
$(outdir)/lily-guile.o: $(outdir)/version.hh
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.143 lilypond/stepmake/aclocal.m4:1.144
--- lilypond/stepmake/aclocal.m4:1.143 Fri May 13 15:45:32 2005
+++ lilypond/stepmake/aclocal.m4 Sat May 14 23:58:43 2005
@@ -410,6 +410,18 @@
])
+
+AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
+ AC_MSG_CHECKING([FlexLexer.h path])
+
+ # ugh.
+ FLEXLEXER_PATH=`echo '#include <FlexLexer.h>' | $CXX -E - | \
+ sed 's!# 1 "\(.*\)FlexLexer.h"[EMAIL PROTECTED]@\1@@!g' | grep '@@' |
\
+ sed '[EMAIL PROTECTED]@\(.*\)@@.*$!\1!g' ` >& /dev/null
+ AC_SUBST(FLEXLEXER_PATH)
+ AC_MSG_RESULT($FLEXLEXER_PATH)
+])
+
AC_DEFUN(STEPMAKE_GCC, [
if test "$GCC" = "yes"; then
STEPMAKE_CHECK_VERSION(CC, $1, $2)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
