X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FSConscript;h=46568d4c18c47d81468798609f870cc3f5b96a23;hb=ab547077f8c694c8edf882ce58fc6ed63407ccb6;hp=2da49d683a212c8ea217e720d2f7a85e89133931;hpb=9458fa215af0294e9c38d62cc3a237a85fe50509;p=lilypond.git

diff --git a/lily/SConscript b/lily/SConscript
index 2da49d683a..46568d4c18 100644
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -1,36 +1,30 @@
 # -*-python-*-
 
-Import ('env')
+Import ('env', 'src_glob', 'install')
 
 outdir = Dir ('.').abspath
-cc_sources =  env['src_glob'] (env, '*.cc')
+
+cc_sources =  src_glob ('*.cc')
 sources = cc_sources + ['parser.yy', 'lexer.ll']
-includes = env['src_glob'] (env, 'include/*.hh')
+includes = src_glob ('include/*.hh')
 
 e = env.Copy ()
-e.Append (CPPPATH = [outdir, '#/lily/include', '#/flower/include'])
-e.Append (LEXFLAGS = ['-Cfe', '-p', '-p'])
 
-# SCons builds parser.cc and parser.hh automagically with this but
-# keeps removing and rebuilding parser.cc because it wants parser.hpp.
-# e.Append (YACCFLAGS = '-d')
-# e.Depends ('lexer.cc', 'parser.cc')
-# e.Depends ('my-lily-lexer.o', 'parser.cc')
-# e.Depends ('my-lily-parser.o', 'parser.cc')
+e.Append (
+	CPPPATH = [
+	  '#/lily/include',
+	  '#/flower/include',
+	  '#/kpath-guile/include',
+	  outdir],
+	LEXFLAGS = ['-Cfe', '-p', '-p'],
+	LIBS = ['flower', 'kpath-guile'],
+	)
 
-# Adding an explicit Builder works well, we do not even need to list
-# header dependencies.
-HH = Builder (action = 'bison -d -o ${TARGET.base}.cc $SOURCE',
-	      suffix = '.hh', src_suffix = '.yy')
-e.Append (BUILDERS = {'HH' : HH})
 e.HH ('parser.hh', 'parser.yy')
-
-e.Append (LIBS = ['flower'])
 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 = env.Command ('lilypond.po', cc_sources + includes, env['pocommand'])
-env.Alias ('po-update', po)
+# let's not, for now
+#po = env.Command ('lilypond.po', cc_sources + includes, env['pocommand'])
+#env.Alias ('po-update', po)