X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FSConscript;h=46568d4c18c47d81468798609f870cc3f5b96a23;hb=68d7330f72a14a8df49c49ed1566179248096092;hp=e67d938c550ede35df16b52bf5bb0f70bcdbe4f6;hpb=d52779d412a1140a74e6f124ec173ca8bd5d6928;p=lilypond.git

diff --git a/lily/SConscript b/lily/SConscript
index e67d938c55..46568d4c18 100644
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -1,37 +1,30 @@
 # -*-python-*-
 
-import glob
-import os
+Import ('env', 'src_glob', 'install')
 
-here = os.getcwd ()
-reldir = str (Dir ('.').srcnode ())
-os.chdir (reldir)
-sources = glob.glob ('*.cc') + ['parser.yy', 'lexer.ll']
-os.chdir (here)
+outdir = Dir ('.').abspath
 
-name = 'lyparser'
+cc_sources =  src_glob ('*.cc')
+sources = cc_sources + ['parser.yy', 'lexer.ll']
+includes = src_glob ('include/*.hh')
 
-Import ('env')
 e = env.Copy ()
 
-e.Append (YACCFLAGS = '-d')
-outdir = os.path.join (env['build'], reldir, env['out'])
-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')
+e.Append (
+	CPPPATH = [
+	  '#/lily/include',
+	  '#/flower/include',
+	  '#/kpath-guile/include',
+	  outdir],
+	LEXFLAGS = ['-Cfe', '-p', '-p'],
+	LIBS = ['flower', 'kpath-guile'],
+	)
 
-# some stuff here from lily-as-lib
-if not os.path.exists ('main.cc'):
-	if env['static']:
-		e.Library (name, sources) 
-	if not env['static'] or env['shared']:
-		e.SharedLibrary (name, sources)
-else:
-	#e.Append (LIBS = ['lygui', 'lyparser', 'lily', 'flower'])
-	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'])
+e.HH ('parser.hh', 'parser.yy')
+e.ParseConfig ('guile-config link')
+lily = e.Program ('lilypond', sources)
+install (lily, env['bindir'])
+
+# let's not, for now
+#po = env.Command ('lilypond.po', cc_sources + includes, env['pocommand'])
+#env.Alias ('po-update', po)