CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/19 17:15:06
Modified files:
stepmake/stepmake: generic-targets.make
lily : GNUmakefile
. : config.make.in SConstruct ChangeLog
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/stepmake/generic-targets.make.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/GNUmakefile.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.make.in.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4196&tr2=1.4197&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4196 lilypond/ChangeLog:1.4197
--- lilypond/ChangeLog:1.4196 Wed Oct 19 13:54:23 2005
+++ lilypond/ChangeLog Wed Oct 19 17:15:06 2005
@@ -1,5 +1,7 @@
2005-10-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * lily/GNUmakefile (OUT_DIST_FILES): Bugfix.
+
* stepmake/stepmake/*:
* */GNUmakefile:
* config.make.in:
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.82 lilypond/SConstruct:1.83
--- lilypond/SConstruct:1.82 Wed Oct 19 13:53:03 2005
+++ lilypond/SConstruct Wed Oct 19 17:15:06 2005
@@ -772,7 +772,7 @@
# 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 @@
('#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 @@
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 @@
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',
Index: lilypond/config.make.in
diff -u lilypond/config.make.in:1.83 lilypond/config.make.in:1.84
--- lilypond/config.make.in:1.83 Wed Oct 19 13:54:23 2005
+++ lilypond/config.make.in Wed Oct 19 17:15:06 2005
@@ -36,7 +36,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-##configure-builddir = @ugh_ugh_autoconf250_builddir@
+configure-builddir = @ugh_ugh_autoconf250_builddir@
configure-srcdir = @srcdir@
bindir = @bindir@
Index: lilypond/lily/GNUmakefile
diff -u lilypond/lily/GNUmakefile:1.58 lilypond/lily/GNUmakefile:1.59
--- lilypond/lily/GNUmakefile:1.58 Wed Oct 19 13:54:23 2005
+++ lilypond/lily/GNUmakefile Wed Oct 19 17:15:06 2005
@@ -14,7 +14,8 @@
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 @@
ifneq ($(configure-srcdir),.)
.PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
endif
-
-
-foe:
- @echo b:$(build-dir)
- @echo s:$(src-dir)
- @echo t:$(tree-dir)
Index: lilypond/stepmake/stepmake/generic-targets.make
diff -u lilypond/stepmake/stepmake/generic-targets.make:1.54
lilypond/stepmake/stepmake/generic-targets.make:1.55
--- lilypond/stepmake/stepmake/generic-targets.make:1.54 Wed Oct 19
13:54:22 2005
+++ lilypond/stepmake/stepmake/generic-targets.make Wed Oct 19 17:15:06 2005
@@ -72,13 +72,10 @@
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
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
