X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FSConscript;h=ebd623fee9a203647ec2667a83a23505e39675a1;hb=85c88bf2574dd95e77a2468580833b9e493430b0;hp=0564d6c939a0d83983ae16587e4d8be43cb7b3f3;hpb=86ee423e83fedb2a5d8b783e2028545035249585;p=lilypond.git

diff --git a/lily/SConscript b/lily/SConscript
index 0564d6c939..ebd623fee9 100644
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -1,30 +1,29 @@
 # -*-python-*-
 
-Import ('env')
-sources = env['src_glob'] (env, '*.cc') + ['parser.yy', 'lexer.ll']
-includes = env['src_glob'] (env, 'include/*.hh')
-outdir = Dir ('.').abspath
+Import ('env', 'src_glob', 'install')
 
-e = env.Copy ()
-e.Append (YACCFLAGS = '-d')
-e.Append (CPPPATH = [outdir, '#/lily/include', '#/flower/include'])
+outdir = Dir ('.').abspath
 
-#e.Depends ('lexer.cc', 'parser.cc')
-#e.Depends ('my-lily-lexer.o', 'parser.cc')
-#e.Depends ('my-lily-parser.o', 'parser.cc')
+cc_sources =  src_glob ('*.cc')
+sources = cc_sources + ['parser.yy', 'lexer.ll']
+includes = src_glob ('include/*.hh')
 
-e.SideEffect ('parser.hh', 'parser.cc')
-e.Depends ('lexer.cc', 'parser.hh')
-e.Depends ('my-lily-lexer.o', 'parser.hh')
-e.Depends ('my-lily-parser.o', 'parser.hh')
+e = env.Copy ()
 
-# map (e.Precious, ['parser.cc', 'lexer.cc', 'parser.hh'])
+e.Append (
+	CPPPATH = [
+	  '#/lily/include',
+	  '#/flower/include',
+	  outdir],
+	LEXFLAGS = ['-Cfe', '-p', '-p'],
+	LIBS = ['flower'],
+	)
 
-e.Append (LIBS = ['flower'])
+e.HH ('parser.hh', 'parser.yy')
 e.ParseConfig ('guile-config link')
-name = 'lilypond-bin'
-lily = e.Program (name, sources)
-env.Install (env['bindir'], lily)
-env.Alias ('install', env['bindir'])
+lily = e.Program ('lilypond', sources)
+install (lily, env['bindir'])
 
-env.Alias ('lily', lily)
+# let's not, for now
+#po = env.Command ('lilypond.po', cc_sources + includes, env['pocommand'])
+#env.Alias ('po-update', po)