* lily/GNUmakefile (OUT_DIST_FILES): Bugfix.

* stepmake/stepmake/*:
* */GNUmakefile:
* config.make.in:
* GNUmakefile.in:
* stepmake/aclocal.m4: Friendlier --srcdir build, allowing `make'
from any directory in build-dir.  Cleanups.

* SConstruct (CheckYYCurrentBuffer): Use TryCompile (there is no
main).

* SConstruct: Resurrect.

diff --git a/ChangeLog b/ChangeLog
index 87aaf0b80f9271fae3c025dacdccb18496f5c92b..e4371afa7417dd18b8decf570500f4d0fc5b447c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-10-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/GNUmakefile (OUT_DIST_FILES): Bugfix.
+
        * stepmake/stepmake/*:
        * */GNUmakefile:
        * config.make.in:

diff --git a/SConstruct b/SConstruct
index d5049e5dab3901602f1cb54f433210bf7a0f01d9..20bb9a49d9bf7678f2d3e255da1e4eb6ecc2ca72 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -772,7 +772,7 @@ env.Append (
 #                       os.path.join (absbuild, 'Documentation/user',
 #                                     env['out']),
                         ],
-       makeinfo_path = ['.', '$srcdir/Documentation/user',
+       MAKEINFO_PATH = ['.', '$srcdir/Documentation/user',
                         '$absbuild/Documentation/user/$out'],
        )
 
@@ -840,10 +840,10 @@ def symlink_tree (target, source, env):
              ('#scm',       'share/lilypond/%(ver)s/scm'),
              ('#scripts',   'share/lilypond/%(ver)s/scripts'),
              ('#ps',        'share/lilypond/%(ver)s/ps'),
-             ('po/@/nl.mo', 'share/locale/nl/lc_messages/lilypond.mo'),
+             ('po/@/nl.mo', 'share/locale/nl/LC_MESSAGES/lilypond.mo'),
              ('elisp',      'share/lilypond/%(ver)s/elisp')))
 
-       print "fixme: barf barf barf"
+       print "FIXME: BARF BARF BARF"
        os.chdir (absbuild)
        out = env['out']
        ver = version
@@ -861,7 +861,7 @@ def symlink_tree (target, source, env):
 if env['debugging']:
        stamp = os.path.join (run_prefix, 'stamp')
        env.command (stamp, ['#/SConstruct', '#/VERSION'],
-                    [symlink_tree, 'touch $target'])
+                    [symlink_tree, 'touch $TARGET'])
        env.depends ('lily', stamp)
        
 #### dist, tar
@@ -911,10 +911,10 @@ else:
        subdirs = string.split (os.popen (command).read ())
 
 if env['fast']\
-   and 'all' not in command_line_targets\
-   and 'doc' not in command_line_targets\
-   and 'web' not in command_line_targets\
-   and 'install' not in command_line_targets\
+   and 'all' not in COMMAND_LINE_TARGETS\
+   and 'doc' not in COMMAND_LINE_TARGETS\
+   and 'web' not in COMMAND_LINE_TARGETS\
+   and 'install' not in COMMAND_LINE_TARGETS\
    and 'clean' not in command_line_targets:
        subdirs = ['lily', 'lily/include',
                   'flower', 'flower/include',

diff --git a/config.make.in b/config.make.in
index fa49dacdffc1c00837247fc8f59a09167919e308..cad6dbca5ae4a94cbad8cd83d409ee5bfb1b6401 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -36,7 +36,7 @@ HAVE_LIBKPATHSEA_SO = @HAVE_LIBKPATHSEA_SO@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-##configure-builddir = @ugh_ugh_autoconf250_builddir@
+configure-builddir = @ugh_ugh_autoconf250_builddir@
 configure-srcdir = @srcdir@
 
 bindir = @bindir@

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index f525d1fc7c5d1cbd71a3aefac0c2ac25718044e4..23b01b580809b43bc42b3d56f8ce651fadf74de6 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -14,7 +14,8 @@ MODULE_CXXFLAGS= -Wno-pmf-conversions
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES=c c++ executable po help2man
 
-OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh )
+# list parser.hh first: making parser.hh removes parser.cc
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
 include $(depth)/make/stepmake.make 
 
@@ -86,9 +87,3 @@ local-po: $(outdir)/parser.cc
 ifneq ($(configure-srcdir),.)
 .PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
 endif
-
-
-foe:
-       @echo b:$(build-dir)
-       @echo s:$(src-dir)
-       @echo t:$(tree-dir)

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 75194985a3872cd1a6cccad5b726a15c136ca53f..e3cbc6ec019f81c1d38f5b21cad6dc853e852d79 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -72,13 +72,10 @@ local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
        case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
                $(LN) $(NON_ESSENTIAL_DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir);; \
        esac
-
        case "$(OUT_DIST_FILES)x" in x) ;; *) \
                mkdir -p $(distdir)/$(localdir)/$(outdir); \
                $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
        esac
-#      $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
-# absolute for installed stepmake
        $(foreach i, $(SUBDIRS), $(MAKE) top-src-dir=$(top-src-dir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true