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

diff --git a/lily/SConscript b/lily/SConscript
index 910a260688..ebd623fee9 100644
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -1,46 +1,29 @@
 # -*-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']
-includes = glob.glob ('include/*.hh')
-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 ()
 
-#let's do this after the split
-#sources = filter (lambda x: x != 'pangofc-afm-decoder.cc', sources)
-#pango = env.Copy ()
-#if pango['gui']:
-#	pango.ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
-#	pango.ParseConfig ('pkg-config --cflags --libs pango')
-#pango.Object ('foo-' + 'pangofc-afm-decoder.o', 'pangofc-afm-decoder.cc')
-#
-#e.Object ('pangofc-afm-decoder.o', 'foo-pangofc-afm-deocder.o')
+e.Append (
+	CPPPATH = [
+	  '#/lily/include',
+	  '#/flower/include',
+	  outdir],
+	LEXFLAGS = ['-Cfe', '-p', '-p'],
+	LIBS = ['flower'],
+	)
 
-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')
-
-# some stuff here from lily-as-lib
-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'])
 
-#testing
-all_sources = ['SConscript',] + sources + includes 
-x = env.Tar (env['tarball'], all_sources)
+# let's not, for now
+#po = env.Command ('lilypond.po', cc_sources + includes, env['pocommand'])
+#env.Alias ('po-update', po)