X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FSConscript;h=ebd623fee9a203647ec2667a83a23505e39675a1;hb=543171165412bc915d8ea1f308d070c74924b2f1;hp=224b8a4236550116bf79716edc9db37498d2dae3;hpb=36a2ef8fd1db451ea9318743561856b4f0907ba2;p=lilypond.git

diff --git a/lily/SConscript b/lily/SConscript
index 224b8a4236..ebd623fee9 100644
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -1,25 +1,29 @@
 # -*-python-*-
 
-Import ('env')
-sources = env['src_glob'] (env, '*.cc') + ['parser.yy', 'lexer.ll']
-includes = env['src_glob'] (env, 'include/*.hh')
+Import ('env', 'src_glob', 'install')
+
 outdir = Dir ('.').abspath
 
+cc_sources =  src_glob ('*.cc')
+sources = cc_sources + ['parser.yy', 'lexer.ll']
+includes = src_glob ('include/*.hh')
+
 e = env.Copy ()
-e.Append (YACCFLAGS = '-d')
-e.Append (CPPPATH = [outdir, '#/lily/include', '#/flower/include'])
 
-e.Depends ('lexer.cc', 'parser.cc')
-e.Depends ('my-lily-lexer.o', 'parser.cc')
-e.Depends ('my-lily-parser.o', 'parser.cc')
-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'])
 
-#po = e.PO (sources + includes)
-#env.Alias ('po', po)
+# let's not, for now
+#po = env.Command ('lilypond.po', cc_sources + includes, env['pocommand'])
+#env.Alias ('po-update', po)