Update using bison-CVS.

[lilypond.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 5ec6fd75c3d093d85d88daec9dfcf0e8e936425a..6246d5268ef9cdb61336fdb5db4ff3c14d808d64 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',
@@ -201,10 +202,10 @@ env.Alias ('config', config_cache)
 
 cachedir = os.path.join (outdir, 'build-cache')
 
-if not os.path.exists(cachedir):
-       os.makedirs(cachedir)
+if not os.path.exists (cachedir):
+       os.makedirs (cachedir)
 
-CacheDir (os.path.join (outdir, 'build-cache'))
+CacheDir (cachedir)
 
 # No need to set $LILYPONDPREFIX to run lily, but cannot install...
 if env['debugging'] and not 'install' in COMMAND_LINE_TARGETS:
@@ -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',
@@ -667,9 +685,10 @@ def symlink_tree (target, source, env):
             # @  := out
             # /$ := add dst file_name
             (('python',     'lib/lilypond/python'),
-             ('lily/',      'bin/lilypond-bin'),
-             ('scripts/',   'bin/lilypond'),
+             ('lily/',      'bin/lilypond'),
+             ('scripts/',   'bin/convert-ly'),
              ('scripts/',   'bin/lilypond-book'),
+             ('scripts/',   'bin/ps2png'),
              ('mf',         'share/lilypond/%(ver)s/dvips/mf-out'),
              ('#ps',        'share/lilypond/%(ver)s/dvips/ps'),
              ('#ps',        'share/lilypond/%(ver)s/tex/music-drawing-routines.ps'),
@@ -686,6 +705,7 @@ def symlink_tree (target, source, env):
              ('mf',         'share/lilypond/%(ver)s/tex/mf-out'),
              ('#ly',        'share/lilypond/%(ver)s/ly'),
              ('#scm',       'share/lilypond/%(ver)s/scm'),
+             ('#scripts',   'share/lilypond/%(ver)s/scripts'),
              ('#ps',        'share/lilypond/%(ver)s/ps'),
              ('po/@/nl.mo', 'share/locale/nl/LC_MESSAGES/lilypond.mo'),
              ('elisp',      'share/lilypond/%(ver)s/elisp')))
@@ -738,7 +758,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 ('.'), [])