From f5925bc5857d39e37111f957b717e8bfa47e3a05 Mon Sep 17 00:00:00 2001 From: janneke Date: Wed, 26 Feb 2003 08:22:59 +0000 Subject: [PATCH] * lily/lexer.ll: * lily/include/my-lily-lexer.hh: * lily/include/includable-lexer.hh: Add flex kludge. * config.hh.in: * config.make.in: * stepmake/aclocal.m4 (STEPMAKE_DATADIR, STEPMAKE_LIBDIR): Junk cruft. * stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fix casual cut and paste code. --- ChangeLog | 14 ++++++++++++++ aclocal.m4 | 39 +++++++++++---------------------------- config.hh.in | 6 ++++-- config.make.in | 15 +++++++++++---- lily/include/includable-lexer.hh | 1 + lily/include/my-lily-lexer.hh | 1 + lily/lexer.ll | 1 + stepmake/aclocal.m4 | 36 +++++++++++------------------------- 8 files changed, 54 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index 908d410655..0837ec9d70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-02-25 Jan Nieuwenhuizen + + * lily/lexer.ll: + * lily/include/my-lily-lexer.hh: + * lily/include/includable-lexer.hh: Add flex kludge. + + * config.hh.in: + * config.make.in: + * stepmake/aclocal.m4 (STEPMAKE_DATADIR, STEPMAKE_LIBDIR): Junk + cruft. + + * stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fix casual cut and paste + code. + 2003-02-24 Jan Nieuwenhuizen * ly/spanners-init.ly (cresc, dim): Update to new markup text. diff --git a/aclocal.m4 b/aclocal.m4 index f198d4c727..695aeddca5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,4 @@ dnl aclocal.m4 -*-shell-script-*- -dnl WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4 -dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -243,51 +240,32 @@ AC_DEFUN(STEPMAKE_DATADIR, [ presome=${ac_default_prefix} fi - package_datadir=$datadir/$package - local_package_datadir=$package_datadir/$FULL_VERSION build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"` - PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"` - LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"` BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(datadir) - AC_SUBST(package_datadir) - AC_SUBST(local_package_datadir) AC_SUBST(build_package_datadir) AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"]) - AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"]) - AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"]) AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"]) ]) ## ugh: cut & paste programming from datadir. AC_DEFUN(STEPMAKE_LIBDIR, [ + if test "$libdir" = "\${exec_prefix}/lib"; then - libdir='${exec_prefix}/lib' + libdir='${exec_prefix}/lib' fi - presome=${exec_prefix} - if test "$exec_prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - - package_libdir=$libdir/$package - local_package_libdir=$package_libdir/$FULL_VERSION + presome=$exec_prefix build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package - DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"` - PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"` - LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"` - BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"` + LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"` + BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"` AC_SUBST(libdir) - AC_SUBST(package_libdir) - AC_SUBST(local_package_libdir) AC_SUBST(build_package_libdir) AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"]) - AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"]) - AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"]) AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"]) ]) @@ -555,7 +533,12 @@ AC_DEFUN(STEPMAKE_INIT, [ AC_SUBST(package) AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_NAME) - AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"]) + # We don't need the upper case variant, + # so stick to macros are uppercase convention. + # AC_DEFINE_UNQUOTED(package, ["${package}"]) + # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"]) + AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"]) AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"]) if test -z "$package_depth"; then diff --git a/config.hh.in b/config.hh.in index 5da27000ad..5e276610b9 100644 --- a/config.hh.in +++ b/config.hh.in @@ -2,15 +2,17 @@ #define PACKAGE "@package@" +#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@" + /* datadir */ #define DATADIR "@DATADIR@" /* LilyPond init and input base directory */ -#define PACKAGE_DATADIR "@PACKAGE_DATADIR@" +#define PACKAGE_DATADIR DATADIR "/" PACKAGE #define LILYPOND_DATADIR PACKAGE_DATADIR /* LilyPond specific init and input directory */ -#define LOCAL_PACKAGE_DATADIR "@LOCAL_PACKAGE_DATADIR@" +#define LOCAL_PACKAGE_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION #define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR /* default lilypond locale dir */ diff --git a/config.make.in b/config.make.in index 3e54d8152d..1bfe4ca5d9 100644 --- a/config.make.in +++ b/config.make.in @@ -27,10 +27,6 @@ datadir = @datadir@ includedir = @includedir@ infodir = @infodir@ libdir = @libdir@ -lilypond_datadir = @package_datadir@ -lilypond_libdir = @package_libdir@ -local_lilypond_datadir = @local_package_datadir@ -local_lilypond_libdir = @local_package_libdir@ localedir = @localedir@ mandir = @mandir@ program_prefix = @program_prefix@ @@ -39,6 +35,17 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ stepmake = @stepmake@ +# move out of config.make.in? +package_datadir = $(datadir)/$(package) +package_libdir = $(libdir)/$(package) +local_package_datadir = $(lilypond_datadir)/$(TOPLEVEL_VERSION) +local_package_libdir = $(lilypond_libdir)/$(TOPLEVEL_VERSION) + +lilypond_datadir = $(package_datadir) +lilypond_libdir = $(package_libdir) +local_lilypond_datadir = $(local_package_datadir) +local_lilypond_libdir = $(local_package_libdir) + CC = @CC@ GCC = @GCC@ CROSS = @cross_compiling@ diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index adff5283bd..a05d707b0d 100644 --- 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 #include "string.hh" diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index fcd89d07ec..27b98cda64 100644 --- 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 #include "input.hh" diff --git a/lily/lexer.ll b/lily/lexer.ll index a0fd1ed4a8..31f7820f03 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -27,6 +27,7 @@ #include #include +using namespace std; #include "parse-scm.hh" #include "lily-guile.hh" diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index fb36d1354d..695aeddca5 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -240,51 +240,32 @@ AC_DEFUN(STEPMAKE_DATADIR, [ presome=${ac_default_prefix} fi - package_datadir=$datadir/$package - local_package_datadir=$package_datadir/$FULL_VERSION build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"` - PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"` - LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"` BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(datadir) - AC_SUBST(package_datadir) - AC_SUBST(local_package_datadir) AC_SUBST(build_package_datadir) AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"]) - AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"]) - AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"]) AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"]) ]) ## ugh: cut & paste programming from datadir. AC_DEFUN(STEPMAKE_LIBDIR, [ + if test "$libdir" = "\${exec_prefix}/lib"; then - libdir='${exec_prefix}/lib' - fi - presome=${exec_prefix} - if test "$exec_prefix" = "NONE"; then - presome=${ac_default_prefix} + libdir='${exec_prefix}/lib' fi - - package_libdir=$libdir/$package - local_package_libdir=$package_libdir/$FULL_VERSION + presome=$exec_prefix build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package - DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"` - PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"` - LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"` - BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"` + LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"` + BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"` AC_SUBST(libdir) - AC_SUBST(package_libdir) - AC_SUBST(local_package_libdir) AC_SUBST(build_package_libdir) AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"]) - AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"]) - AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"]) AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"]) ]) @@ -552,7 +533,12 @@ AC_DEFUN(STEPMAKE_INIT, [ AC_SUBST(package) AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_NAME) - AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"]) + # We don't need the upper case variant, + # so stick to macros are uppercase convention. + # AC_DEFINE_UNQUOTED(package, ["${package}"]) + # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"]) + AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"]) AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"]) if test -z "$package_depth"; then -- 2.11.4.GIT