* ttftool/SConscript:

* kpath-guile/SConscript: New file.

* lily/SConscript:
* SConstruct: Update.

diff --git a/ChangeLog b/ChangeLog
index b23845d054bac5db5093a417bd671c279d6dd731..740b8d3fd2b837256656b5fdef1c2a790892222b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * ttftool/SConscript:
+       * kpath-guile/SConscript: New file.
+
+       * lily/SConscript:
+       * SConstruct: Update.
+
 2005-03-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * VERSION (PACKAGE_NAME): release 2.5.14

diff --git a/SConstruct b/SConstruct
index 5ec6fd75c3d093d85d88daec9dfcf0e8e936425a..56e6785f452c5f7c5620ac78c8e85b1858a33510 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -150,6 +150,7 @@ env = Environment (
        ENV = ENV,
 
        BASH = '/bin/bash',
+       CPPDEFINES = '-DHAVE_CONFIG_H',
        PERL = '/usr/bin/perl',
        PYTHON = '/usr/bin/python',
        SH = '/bin/sh',
@@ -365,6 +366,9 @@ def configure (target, source, env):
        if conf.CheckLib ('kpathsea', 'kpse_find_tfm'):
                conf.env['DEFINES']['HAVE_KPSE_FIND_TFM'] = '1'
 
+       # FIXME fc3 - move to kpath-guile/SConscript?
+       conf.env['DEFINES']['HAVE_LIBKPATHSEA_SO'] = '1'
+
        if env['fast']:
                cpppath = []
                if env.has_key ('CPPPATH'):
@@ -374,6 +378,17 @@ def configure (target, source, env):
        #this could happen after flower...
        env.ParseConfig ('guile-config compile')
 
+       ## FIXME: pkg-test to required/optional
+       if os.system ('pkg-config --atleast-version=1.6.0 pango'):
+               barf
+       env.ParseConfig ('pkg-config --cflags --libs pango')
+       conf.env['DEFINES']['HAVE_PANGO16'] = '1'
+       
+       if os.system ('pkg-config --atleast-version=1.6.0 pangoft2'):
+               barf
+       env.ParseConfig ('pkg-config --cflags --libs pangoft2')
+       conf.env['DEFINES']['HAVE_PANGO_FT2'] = '1'
+       
        #this could happen only for compiling pango-*
        if env['gui']:
                env.ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
@@ -610,7 +625,10 @@ env.Append (
        run_prefix = run_prefix,
        LILYPONDPREFIX = os.path.join (run_prefix, 'share/lilypond'),
 
-       LIBPATH = [os.path.join (absbuild, 'flower', env['out']),],
+       # FIXME: move to lily/SConscript?
+       LIBPATH = [os.path.join (absbuild, 'flower', env['out']),
+                  os.path.join (absbuild, 'kpath-guile', env['out']),
+                  os.path.join (absbuild, 'ttftool', env['out']),],
        CPPPATH = [outdir, ],
        LILYPOND_PATH = ['.', '$srcdir/input',
                         '$srcdir/input/regression',
@@ -738,7 +756,12 @@ if env['fast']\
    and 'web' not in COMMAND_LINE_TARGETS\
    and 'install' not in COMMAND_LINE_TARGETS\
    and 'clean' not in COMMAND_LINE_TARGETS:
-       subdirs = ['lily', 'lily/include', 'flower', 'flower/include', 'mf']
+       subdirs = ['lily', 'lily/include',
+                  'flower', 'flower/include',
+                  'kpath-guile',
+                  'ttftool',
+                  'mf',
+                  ]
 else:
        subdirs = flatten (cvs_dirs ('.'), [])
 

diff --git a/flower/SConscript b/flower/SConscript
index 34a034ff8fd679040e1629339912e6b66a400348..a3a800a86ecf62295c620ac54ca2a83ecca38833 100644 (file)
--- a/flower/SConscript
+++ b/flower/SConscript
@@ -2,12 +2,12 @@
 
 Import ('env', 'src_glob')
 sources = src_glob ('*.cc')
-includes = src_glob ('*.hh')
+includes = src_glob ('include/*.hh')
 outdir = Dir ('.').path
 
 name = 'flower'
 e = env.Copy ()
-e.Append (CPPPATH = [outdir, 'include'])
+e.Append (CPPPATH = ['#/flower/include', outdir,])
 if env['static']:
        e.Library (name, sources) 
 if not env['static'] or env['shared']:

diff --git a/kpath-guile/SConscript b/kpath-guile/SConscript
new file mode 100644 (file)
index 0000000..fad6933
--- /dev/null
+++ b/kpath-guile/SConscript
@@ -0,0 +1,19 @@
+# -*-python-*-
+
+Import ('env', 'src_glob')
+sources = src_glob ('*.c')
+includes = src_glob ('*.h')
+outdir = Dir ('.').path
+
+name = 'kpath-guile'
+e = env.Copy ()
+e.Append (CPPPATH = ['/#ttftool/include', '#/flower/include', outdir,],
+         CCFLAGS = '-std=c99',
+         )
+if env['static']:
+       e.Library (name, sources) 
+if not env['static'] or env['shared']:
+       e.SharedLibrary (name, sources)
+
+po = env.Command ('lilypond.po', sources + includes, env['pocommand'])
+env.Alias ('po-update', po)

diff --git a/lily/SConscript b/lily/SConscript
index 663213c671e0386141fcc766ff2cf4469fffb94b..3e994a29dde980b24391e0b42260aaf58a7ade22 100644 (file)
--- a/lily/SConscript
+++ b/lily/SConscript
@@ -14,9 +14,11 @@ e.Append (
        CPPPATH = [
          '#/lily/include',
          '#/flower/include',
+         '#/kpath-guile/include',
+         '#/ttftool/include',
          outdir],
        LEXFLAGS = ['-Cfe', '-p', '-p'],
-       LIBS = ['flower'],
+       LIBS = ['flower', 'ttftool', 'kpath-guile'],
        )
 
 e.HH ('parser.hh', 'parser.yy')

diff --git a/ttftool/SConscript b/ttftool/SConscript
new file mode 100644 (file)
index 0000000..5f24fbe
--- /dev/null
+++ b/ttftool/SConscript
@@ -0,0 +1,17 @@
+# -*-python-*-
+
+Import ('env', 'src_glob')
+sources = src_glob ('*.c')
+includes = src_glob ('include/*.h')
+outdir = Dir ('.').path
+
+name = 'ttftool'
+e = env.Copy ()
+e.Append (CPPPATH = ['#/flower/include', '#/ttftool/include', outdir,])
+if env['static']:
+       e.Library (name, sources) 
+if not env['static'] or env['shared']:
+       e.SharedLibrary (name, sources)
+
+po = env.Command ('lilypond.po', sources + includes, env['pocommand'])
+env.Alias ('po-update', po)