]> git.lyx.org Git - lyx.git/blobdiff - development/scons/SConstruct
get rid of QT3_SUPPORT
[lyx.git] / development / scons / SConstruct
index d843a15c8902d49ed9e1990154df7a3980b611c6..915e1e18d6d2eba52acb7e4c49a9540c4dd2dd32 100644 (file)
@@ -17,6 +17,8 @@ import os, sys, copy, cPickle, glob
 # scons_utils.py defines a few utility function
 sys.path.append('config')
 import scons_utils as utils
+# import all file lists
+from scons_manifest import *
 
 #----------------------------------------------------------
 # Required runtime environment
@@ -24,8 +26,14 @@ import scons_utils as utils
 
 # scons asks for 1.5.2, lyx requires 2.3
 EnsurePythonVersion(2, 3)
-# Please use at least 0.96.91 (not 0.96.1)
+# Please use at least 0.96.92 (not 0.96.1)
 EnsureSConsVersion(0, 96)
+# also check for minor version number for scons 0.96
+from SCons import __version__
+version = map(int, __version__.split('.'))
+if version[0] == 0 and version[1] == 96 and version[2] < 92:
+    print "Scons >= 0.96.92 is required."
+    Exit(1)
 
 # determine where I am ...
 #
@@ -45,16 +53,11 @@ else:
 
 # some global settings
 #
-# detect version of lyx
-# only 1.4.x has frontends/qt2
-if os.path.isdir(os.path.join(top_src_dir, 'src', 'frontends', 'qt2')):
-    package_version = '1.4.2svn'
-else:
-    package_version = '1.5.0svn'
+package_version = '1.5.0svn'
+boost_version = '1_33_1'
 
 devel_version = True
 default_build_mode = 'debug'
-lyx_ext = '*.C'
 
 package = 'lyx'
 package_bugreport = 'lyx-devel@lists.lyx.org'
@@ -86,7 +89,7 @@ elif os.name == 'posix' and sys.platform != 'cygwin':
 elif os.name == 'posix' and sys.platform == 'cygwin':
     platform_name = 'cygwin'
     default_frontend = 'qt3'
-    default_prefix = '/usr/local'
+    default_prefix = '/usr'
     default_with_x = True
     default_packaging_method = 'posix'
 elif os.name == 'darwin':
@@ -103,7 +106,6 @@ else:  # unsupported system, assume posix behavior
     default_with_x = True
     default_packaging_method = 'posix'
 
-
 #---------------------------------------------------------
 # Handling options
 #----------------------------------------------------------
@@ -117,7 +119,7 @@ opts = Options(['config.py'])
 opts.AddOptions(
     # frontend
     EnumOption('frontend', 'Main GUI', default_frontend,
-        allowed_values = ('xform', 'qt2', 'qt3', 'qt4', 'gtk') ),
+        allowed_values = ('qt3', 'qt4', 'gtk') ),
     # debug or release build
     EnumOption('mode', 'Building method', default_build_mode,
         allowed_values = ('debug', 'release') ),
@@ -168,11 +170,9 @@ opts.AddOptions(
     #
     PathOption('qt_dir', 'Path to qt directory', None),
     #
-    PathOption('qt_include_path', 'Path to qt include directory', None),
+    PathOption('qt_inc_path', 'Path to qt include directory', None),
     #
     PathOption('qt_lib_path', 'Path to qt library directory', None),
-    # build directory, will use $mode if not set
-    PathOption('build_dir', 'Build directory', None),
     # extra include and libpath
     PathOption('extra_inc_path', 'Extra include path', None),
     #
@@ -184,9 +184,14 @@ opts.AddOptions(
     #
     PathOption('extra_lib_path1', 'Extra library path', None),
     # rebuild only specifed, comma separated targets
-    ('rebuild', 'rebuild only specifed, comma separated targets', None),
+    ('rebuild', '''rebuild only specifed, comma separated targets.
+        yes or all (default): rebuild everything
+        no or none: rebuild nothing (usually used for installation)
+        comp1,comp2,...: rebuild specified targets''', None),
     # can be set to a non-existing directory
     ('prefix', 'install architecture-independent files in PREFIX', default_prefix),
+    # build directory, will use $mode if not set
+    ('build_dir', 'Build directory', None),
     # version suffix
     ('version_suffix', 'install lyx as lyx-suffix', None),
     # how to load options
@@ -215,6 +220,9 @@ opts.AddOptions(
     ('LINKFLAGS', 'replace default $LINKFLAGS', None),
 )
 
+# allowed options
+all_options = [x.key for x in opts.options]
+
 # copied from SCons/Options/BoolOption.py
 # We need to use them before a boolean ARGUMENTS option is available
 # in env as bool.
@@ -263,10 +271,15 @@ if (not ARGUMENTS.has_key('load_option') or \
                 print "  ** fast_start is disabled because of the change of option", arg
                 print
                 fast_start = False
-    # and we do not cache some options
-    for arg in ['fast_start', 'load_option']:
+    # and we do not cache some options (dest_dir is obsolete)
+    for arg in ['fast_start', 'load_option', 'dest_dir']:
         if opt_cache.has_key(arg):
             opt_cache.pop(arg)
+    # remove obsolete cached keys (well, SConstruct is evolving. :-)
+    for arg in opt_cache.keys():
+        if arg not in all_options:
+            print 'Option %s is obsolete, do not load it' % arg
+            opt_cache.pop(arg)
     # now, if load_option=opt1,opt2 or -opt1,opt2
     if ARGUMENTS.has_key('load_option') and \
         ARGUMENTS['load_option'] not in true_strings + false_strings:
@@ -288,6 +301,16 @@ if (not ARGUMENTS.has_key('load_option') or \
             print "Restoring cached option  %s=%s" % (key, ARGUMENTS[key])
     print
 
+# check if there is unused (or misspelled) argument
+for arg in ARGUMENTS.keys():
+    if arg not in all_options:
+        import textwrap
+        print "Unknown option '%s'... exiting." % arg
+        print
+        print "Available options are (check 'scons -help' for details):"
+        print '    ' + '\n    '.join(textwrap.wrap(',  '.join(all_options)))
+        Exit(1)
+
 # save arguments
 env_cache['arg_cache'] = ARGUMENTS
 
@@ -329,6 +352,15 @@ else:
 # to build multiple build_dirs using the same source
 # $mode can be debug or release
 if env.has_key('build_dir') and env['build_dir'] is not None:
+    # create the directory if needed
+    if not os.path.isdir(env['build_dir']):
+        try:
+            os.makedirs(env['build_dir'])
+        except:
+            pass
+        if not os.path.isdir(env['build_dir']):
+            print 'Can not create directory', env['build_dir']
+            Exit(3)
     env['BUILDDIR'] = env['build_dir']
 else:
     # Determine the name of the build $mode
@@ -352,10 +384,6 @@ env.AppendUnique(LIBPATH = ['$LOCALLIBPATH'])
 #       PACKAGE_VERSION
 #     src/version.C.in
 #       PACKAGE_VERSION, VERSION_INFO
-#     src/frontends/xforms/lyx_xpm.h.in
-#       XPM_H_LOCATION
-#     src/frontends/xforms/lyx_forms.h.in
-#       FORMS_H_LOCATION
 
 # full path name is used to build msvs project files
 # and to replace TOP_SRCDIR in package.C
@@ -538,20 +566,26 @@ if env.has_key('dest_dir'):
 
 if env.has_key('qt_dir') and env['qt_dir']:
     env['QTDIR'] = env['qt_dir']
+elif os.path.isdir(os.environ.get('QTDIR', '/usr/lib/qt-3.3')):
+    env['QTDIR'] = os.environ.get('QTDIR', '/usr/lib/qt-3.3')
+
+# if there is a valid QTDIR, set path for lib and bin directories
+if env.has_key('QTDIR'):
     # add path to the qt tools
-    env.AppendUnique(LIBPATH = [os.path.join(env['qt_dir'], 'lib')])
+    if os.path.isdir(os.path.join(env['QTDIR'], 'lib')):
+        env.AppendUnique(LIBPATH = [os.path.join(env['QTDIR'], 'lib')])
     # set environment so that moc etc can be found even if its path is not set properly
-    env.PrependENVPath('PATH', os.path.join(env['qt_dir'], 'bin'))
-else:
-    env['QTDIR'] = os.environ.get('QTDIR', '/usr/lib/qt-3.3')
+    if os.path.isdir(os.path.join(env['QTDIR'], 'bin')):
+        os.environ['PATH'] += os.pathsep + os.path.join(env['QTDIR'], 'bin')
+        env.PrependENVPath('PATH', os.path.join(env['QTDIR'], 'bin'))
 
 if env.has_key('qt_lib_path') and env['qt_lib_path']:
     qt_lib_path = env.subst('$qt_lib_path')
-elif os.path.isdir(os.path.join(env.subst('$QTDIR'), 'lib')):
+elif env.has_key('QTDIR') and os.path.isdir(os.path.join(env.subst('$QTDIR'), 'lib')):
     qt_lib_path = env.subst('$QTDIR/lib')
 # this is the path for cygwin.
 elif os.path.isdir(os.path.join('/usr/lib/', frontend, 'lib')):
-    qt_lib_path = env.subst('/usr/lib/$frontend/lib')
+    qt_lib_path = '/usr/lib/%s/lib' % frontend
 else:
     print "Qt library directory is not found. Please specify it using qt_lib_path"
     Exit(1)
@@ -561,11 +595,11 @@ env.PrependENVPath('PKG_CONFIG_PATH', qt_lib_path)
 
 if env.has_key('qt_inc_path') and env['qt_inc_path']:
     qt_inc_path = env['qt_inc_path']
-elif os.path.isdir(os.path.join(env.subst('$QTDIR'), 'include')):
+elif env.has_key('QTDIR') and os.path.isdir(os.path.join(env.subst('$QTDIR'), 'include')):
     qt_inc_path = '$QTDIR/include'
 # this is the path for cygwin.
 elif os.path.isdir('/usr/include/' + frontend):
-    qt_inc_path = '/usr/include/$frontend'
+    qt_inc_path = '/usr/include/' + frontend
 else:
     print "Qt include directory not found. Please specify it using qt_inc_path"
     Exit(1)
@@ -586,9 +620,9 @@ if env.has_key('extra_inc_path1') and env['extra_inc_path1']:
 if env.has_key('extra_lib_path1') and env['extra_lib_path1']:
     env.AppendUnique(LIBPATH = [env['extra_lib_path1']])
 if env.has_key('extra_bin_path') and env['extra_bin_path']:
-    # maybe only one of them is needed
+    # only the first one is needed (a scons bug?)
     os.environ['PATH'] += os.pathsep + env['extra_bin_path']
-    env['ENV']['PATH'] += os.pathsep + env['extra_bin_path']
+    env.PrependENVPath('PATH', env['extra_bin_path'])
 # extra_inc_paths will be used later by intlenv etc
 env.AppendUnique(CPPPATH = extra_inc_paths)
 
@@ -628,13 +662,27 @@ if not fast_start:
         or (use_vc and not conf.CheckLibWithHeader('zdll', 'zlib.h', 'C')):
         print 'Did not find zdll.lib or zlib.h, exiting!'
         Exit(1)
+    has_iconv = conf.CheckLib('iconv')
+    has_libiconv = conf.CheckLib('libiconv')
+    if has_iconv:
+        env['ICONV_LIB'] = 'iconv'
+    elif has_libiconv:
+        env['ICONV_LIB'] = 'libiconv'
+    else:
+        print 'Did not find iconv or libiconv, exiting!'
+        Exit(1)
+    env_cache['ICONV_LIB'] = env['ICONV_LIB']
+else:
+    env['ICONV_LIB'] = env_cache['ICONV_LIB']
 
 # qt libraries?
 if not fast_start:
     #
     # qt3 does not use pkg_config
-    if frontend in ['qt2', 'qt3']:
-        if not conf.CheckLibWithHeader('qt-mt', 'qapp.h', 'c++', 'QApplication qapp();'):
+    if frontend == 'qt3':
+        # windows lib name is qt-mt3
+        if not conf.CheckLibWithHeader('qt-mt', 'qapp.h', 'c++', 'QApplication qapp();') \
+            and not conf.CheckLibWithHeader('qt-mt3', 'qapp.h', 'c++', 'QApplication qapp();'):
             print 'Did not find qt libraries, exiting!'
             Exit(1)
     elif frontend == 'qt4':
@@ -668,10 +716,13 @@ if not fast_start:
 
 # now, if msvc2005 is used, we will need that QT_LIB_PATH/QT_LIB.manifest file
 if use_vc:
-    if mode == 'debug':
-        manifest = os.path.join(qt_lib_path, 'QtGuid4.dll.manifest')
-    else:
-        manifest = os.path.join(qt_lib_path, 'QtGui4.dll.manifest')
+    if frontend == 'qt3':
+        manifest = os.path.join(qt_lib_path, 'qt-mt3.dll.manifest')
+    elif frontend == 'qt4':
+        if mode == 'debug':
+            manifest = os.path.join(qt_lib_path, 'QtGuid4.dll.manifest')
+        else:
+            manifest = os.path.join(qt_lib_path, 'QtGui4.dll.manifest')
     if os.path.isfile(manifest):
         env['LINKCOM'] = [env['LINKCOM'], 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % manifest]
 
@@ -698,42 +749,43 @@ if not fast_start:
     # check boost libraries
     boost_opt = ARGUMENTS.get('boost', 'auto')
     # check for system boost
-    paths = env['LIBPATH'] + ['/usr/lib', '/usr/local/lib']
-    # real libraries (included or system)
-    boost_libraries = []
+    lib_paths = env['LIBPATH'] + ['/usr/lib', '/usr/local/lib']
+    inc_paths = env['CPPPATH'] + ['/usr/include', '/usr/local/include']
+    # default to $BUILDDIR/libs (use None since this path will be added anyway)
     boost_libpath = None
     # here I assume that all libraries are in the same directory
-    for lib in boost_libs:
-        if boost_opt == 'included':
-            boost_libraries.append('included_boost_%s' % lib)
-            env['INCLUDED_BOOST'] = True
-        elif boost_opt == 'auto':
-            res = conf.CheckBoostLibraries('boost_%s' % lib , paths)
-            # if not found
-            if res[0] == '':
-                boost_libraries.append('included_boost_%s' % lib)
-                env['INCLUDED_BOOST'] = True
-            else:
-                boost_libraries.append(res[1])
-                env['INCLUDED_BOOST'] = False
-                boost_libpath = res[0]
-        elif boost_opt == 'system':
-            res = conf.CheckBoostLibraries('boost_%s' % lib , paths)
-            if res[0] == '':
-                print "Can not find system boost libraries"
-                print "Please supply a path through extra_lib_path and try again."
-                print "Or use boost=included to use included boost libraries."
-                Exit(2)
-            else:
-                boost_libraries.append(res[1])
-                env.AppendUnique(LIBPATH = [res[0]])
-                boost_libpath = res[0]
+    if boost_opt == 'included':
+        boost_libraries = ['included_boost_%s' % x for x in boost_libs]
+        included_boost = True
+        env['BOOST_INC_PATH'] = '$TOP_SRCDIR/boost'
+    elif boost_opt == 'auto':
+        res = conf.CheckBoostLibraries(boost_libs, lib_paths, inc_paths, boost_version, mode == 'debug')
+        # if not found, use local boost
+        if res[0] is None:
+            boost_libraries = ['included_boost_%s' % x for x in boost_libs]
+            included_boost = True
+            env['BOOST_INC_PATH'] = '$TOP_SRCDIR/boost'
+        else:
+            included_boost = False
+            (boost_libraries, boost_libpath, env['BOOST_INC_PATH']) = res
+    elif boost_opt == 'system':
+        res = conf.CheckBoostLibraries(boost_libs, lib_paths, inc_paths, boost_version, mode == 'debug')
+        if res[0] is None:
+            print "Can not find system boost libraries with version %s " % boost_version
+            print "Please supply a path through extra_lib_path and try again."
+            print "Or use boost=included to use included boost libraries."
+            Exit(2)
+        else:
+            included_boost = False
+            (boost_libraries, boost_libpath, env['BOOST_INC_PATH']) = res
     env_cache['BOOST_LIBRARIES'] = boost_libraries
-    env_cache['INCLUDED_BOOST'] = env['INCLUDED_BOOST']
+    env_cache['INCLUDED_BOOST'] = included_boost
+    env_cache['BOOST_INC_PATH'] = env['BOOST_INC_PATH']
     env_cache['BOOST_LIBPATH'] = boost_libpath
 else:
     boost_libraries = env_cache['BOOST_LIBRARIES']
-    env['INCLUDED_BOOST'] = env_cache['INCLUDED_BOOST']
+    included_boost = env_cache['INCLUDED_BOOST']
+    env['BOOST_INC_PATH'] = env_cache['BOOST_INC_PATH']
     boost_libpath = env_cache['BOOST_LIBPATH']
 
 if boost_libpath is not None:
@@ -781,6 +833,13 @@ if not fast_start:
 else:
     env['MSGFMT'] = env_cache['MSGFMT']
 
+# check uic and moc commands for qt frontends
+if not fast_start:
+    if frontend[:2] == 'qt' and (conf.CheckCommand('uic') == None \
+        or conf.CheckCommand('moc') == None):
+        print 'uic or moc command is not found for frontend', frontend
+        Exit(1)
+
 #
 # Customized builders
 #
@@ -849,7 +908,6 @@ if not fast_start or not os.path.isfile(boost_config_h) \
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 
 #define BOOST_DISABLE_THREADS 1
-#define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
@@ -975,7 +1033,6 @@ int count()
         ],
         libs = [
             ('gdi32', 'HAVE_LIBGDI32'),
-            (('iconv', 'libiconv'), 'HAVE_ICONV', 'ICONV_LIB'),
             (('Aiksaurus', 'libAiksaurus'), 'HAVE_LIBAIKSAURUS', 'AIKSAURUS_LIB'),
         ],
         custom_tests = [
@@ -993,6 +1050,12 @@ int count()
                 'MKDIR_TAKES_ONE_ARG',
                 'Define if mkdir takes only one argument.'
             ),
+            (conf.CheckIconvConst(),
+                'ICONV_CONST',
+                'Define as const if the declaration of iconv() needs const.',
+                '#define ICONV_CONST const',
+                '#define ICONV_CONST',
+            ),
             (conf.CheckLC_MESSAGES(),
                 'HAVE_LC_MESSAGES',
                 'Define if your <locale.h> file defines LC_MESSAGES.'
@@ -1082,8 +1145,7 @@ int mkstemp(char*);
 
     # these keys are needed in env
     for key in ['USE_ASPELL', 'USE_PSPELL', 'USE_ISPELL', 'HAVE_FCNTL',\
-        'HAVE_ICONV', 'HAVE_LIBGDI32', 'HAVE_LIBAIKSAURUS',
-        'ICONV_LIB', 'AIKSAURUS_LIB']:
+        'HAVE_LIBGDI32', 'HAVE_LIBAIKSAURUS', 'AIKSAURUS_LIB']:
         # USE_ASPELL etc does not go through result
         if result.has_key(key):
             env[key] = result[key]
@@ -1164,7 +1226,6 @@ int mkstemp(char*);
                 ('uintmax_t', 'HAVE_STDINT_H_WITH_UINTMAX', '#include <stdint.h>'),
             ],
             libs = [
-                (('iconv', 'libiconv'), 'HAVE_ICONV', 'ICONV_LIB'),
                 ('c', 'HAVE_LIBC'),
             ],
             custom_tests = [
@@ -1175,8 +1236,8 @@ int mkstemp(char*);
                 (conf.CheckIconvConst(),
                     'ICONV_CONST',
                     'Define as const if the declaration of iconv() needs const.',
-                    '#define ICONV_CONST',
                     '#define ICONV_CONST const',
+                    '#define ICONV_CONST',
                 ),
                 (conf.CheckType('intmax_t', includes='#include <stdint.h>') or \
                 conf.CheckType('intmax_t', includes='#include <inttypes.h>'),
@@ -1188,12 +1249,15 @@ int mkstemp(char*);
                     "Define to 1 if translation of program messages to the user's native anguage is requested.",
                 ),
             ],
+            extra_items = [
+                ('#define HAVE_ICONV 1', 'Define if iconv or libiconv is found')
+            ],
             config_post = '#endif'
         )
 
         # these keys are needed in env
         for key in ['HAVE_ASPRINTF', 'HAVE_WPRINTF', 'HAVE_SNPRINTF', \
-            'HAVE_POSIX_PRINTF', 'HAVE_ICONV', 'HAVE_LIBC']:
+            'HAVE_POSIX_PRINTF', 'HAVE_LIBC']:
             # USE_ASPELL etc does not go through result
             if result.has_key(key):
                 env[key] = result[key]
@@ -1208,15 +1272,14 @@ else:
     conf.CheckCHeader('io.h')
     # only a few variables need to be rescanned
     for key in ['USE_ASPELL', 'USE_PSPELL', 'USE_ISPELL', 'HAVE_FCNTL',\
-        'HAVE_ICONV', 'HAVE_LIBGDI32', 'HAVE_LIBAIKSAURUS',
-        'ICONV_LIB', 'AIKSAURUS_LIB']:
+        'HAVE_LIBGDI32', 'HAVE_LIBAIKSAURUS', 'AIKSAURUS_LIB']:
         env[key] = env_cache[key]
     #
     # nls related keys
     if env['nls'] and included_gettext:
         # only a few variables need to be rescanned
         for key in ['HAVE_ASPRINTF', 'HAVE_WPRINTF', 'HAVE_SNPRINTF', \
-            'HAVE_POSIX_PRINTF', 'HAVE_ICONV', 'HAVE_LIBC']:
+            'HAVE_POSIX_PRINTF', 'HAVE_LIBC']:
             env[key] = env_cache[key]
 
 # this looks misplaced, but intl/libintl.h is needed by src/message.C
@@ -1239,47 +1302,44 @@ env = conf.Finish()
 #
 # NOTE: Tool('qt') or Tool('qt4') will be loaded later
 # in their respective directory and specialized env.
-try:
-    if frontend in ['qt2', 'qt3']:
-        # note: env.Tool('qt') my set QT_LIB to qt
+if frontend == 'qt3':
+    # note: env.Tool('qt') my set QT_LIB to qt
+    if platform_name == 'win32':
+        qt_libs = ['qt-mt3']
+    else:
         qt_libs = ['qt-mt']
-        frontend_libs = ['qt-mt']
-    elif frontend == 'qt4':
-        qt_libs = ['QtCore', 'QtGui']
-        # set the right lib names
-        if platform_name == 'win32':
-            if mode == 'debug' and use_vc:
-                qt_lib_suffix = 'd4'
-            else:
-                qt_lib_suffix = '4'
+    frontend_libs = qt_libs
+elif frontend == 'qt4':
+    qt_libs = ['QtCore', 'QtGui']
+    # set the right lib names
+    if platform_name == 'win32':
+        if mode == 'debug' and use_vc:
+            qt_lib_suffix = 'd4'
+        else:
+            qt_lib_suffix = '4'
+    else:
+        if mode == 'debug':
+            qt_lib_suffix = '_debug'
         else:
-            if mode == 'debug':
-                qt_lib_suffix = '_debug'
-            else:
-                qt_lib_suffix = ''
-        frontend_libs = [x + qt_lib_suffix for x in qt_libs]
-except:
-    print "Can not locate qt tools"
-    print "What I get is "
-    print "  QTDIR: ", env['QTDIR']
+            qt_lib_suffix = ''
+    frontend_libs = [x + qt_lib_suffix for x in qt_libs]
 
 
 if platform_name in ['win32', 'cygwin']:
     # the final link step needs stdc++ to succeed under mingw
     # FIXME: shouldn't g++ automatically link to stdc++?
     if use_vc:
-        system_libs = ['shlwapi', 'shell32', 'advapi32', 'zdll']
+        system_libs = [env['ICONV_LIB'], 'shlwapi', 'shell32', 'advapi32', 'zdll']
     else:
-        system_libs = ['shlwapi', 'stdc++', 'z']
+        system_libs = [env['ICONV_LIB'], 'shlwapi', 'stdc++', 'z']
 elif platform_name == 'cygwin' and env['X11']:
-    system_libs = ['GL',  'Xmu', 'Xi', 'Xrender', 'Xrandr', 'Xcursor',
-        'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE', 'resolv',
-        'pthread', 'z']
+    system_libs = [env['ICONV_LIB'], 'GL',  'Xmu', 'Xi', 'Xrender', 'Xrandr',
+        'Xcursor', 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE', 
+        'resolv', 'pthread', 'z']
 else:
-    system_libs = ['z']
+    system_libs = [env['ICONV_LIB'], 'z']
 
 libs = [
-    ('HAVE_ICONV', env['ICONV_LIB']),
     ('HAVE_LIBGDI32', 'gdi32'),
     ('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']),
     ('USE_ASPELL', aspell_lib),
@@ -1302,7 +1362,20 @@ if env['X11']:
 # BUILDDIR/common: for config.h
 # TOP_SRCDIR/src: for support/* etc
 #
-env['CPPPATH'] += ['$TOP_SRCDIR/boost', '$BUILDDIR/common', '$TOP_SRCDIR/src']
+env['CPPPATH'] += ['$BUILDDIR/common', '$TOP_SRCDIR/src']
+#
+# Separating boost directories from CPPPATH stops scons from building
+# the dependency tree for boost header files, and effectively reduce
+# the null build time of lyx from 29s to 16s. Since lyx may tweak local
+# boost headers, this is only done for system boost headers.
+if included_boost:
+    env.AppendUnique(CPPPATH = ['$BOOST_INC_PATH'])
+else:
+    if use_vc:
+        env.PrependUnique(CCFLAGS = ['/I$BOOST_INC_PATH'])
+    else:
+        env.PrependUnique(CCFLAGS = ['-I$BOOST_INC_PATH'])
+
 # for intl/config.h, intl/libintl.h and intl/libgnuintl.h
 if env['nls'] and included_gettext:
     env['CPPPATH'].append('$BUILDDIR/intl')
@@ -1361,7 +1434,7 @@ Frontend:
     frontend, packaging_method,
     prefix, env['LYX_DIR'])
 
-if frontend in ['qt2', 'qt3', 'qt4']:
+if frontend in ['qt3', 'qt4']:
     env['VERSION_INFO'] += '''  include dir:                    %s
   library dir:                    %s
   X11:                            %s
@@ -1413,6 +1486,12 @@ print "Building all targets recursively"
 
 if env.has_key('rebuild'):
     rebuild_targets = env['rebuild'].split(',')
+    if 'none' in rebuild_targets or 'no' in rebuild_targets:
+        rebuild_targets = []
+    elif 'all' in rebuild_targets or 'yes' in rebuild_targets:
+        # None: let scons decide which components to build
+        # Forcing all components to be rebuilt is in theory not necessary
+        rebuild_targets = None    
 else:
     rebuild_targets = None
 
@@ -1420,11 +1499,15 @@ def libExists(libname):
     ''' Check whether or not lib $LOCALLIBNAME/libname already exists'''
     return os.path.isfile(File(env.subst('$LOCALLIBPATH/${LIBPREFIX}%s$LIBSUFFIX'%libname)).abspath)
 
+def appExists(apppath, appname):
+    ''' Check whether or not application already exists'''
+    return os.path.isfile(File(env.subst('$BUILDDIR/common/%s/${PROGPREFIX}%s$PROGSUFFIX' % (apppath, appname))).abspath)
+
 targets = BUILD_TARGETS
 # msvc need to pass full target name, so I have to look for path/lyx etc
 build_lyx = targets == [] or True in ['lyx' in x for x in targets] \
     or 'install' in targets or 'all' in targets
-build_boost = (env['INCLUDED_BOOST'] and not libExists('boost_regex')) or 'boost' in targets
+build_boost = (included_boost and not libExists('boost_regex')) or 'boost' in targets
 build_intl = (included_gettext and not libExists('included_intl')) or 'intl' in targets
 build_support = build_lyx or True in [x in targets for x in ['support', 'client', 'tex2lyx']]
 build_mathed = build_lyx or 'mathed' in targets
@@ -1438,15 +1521,14 @@ build_tex2lyx = True in ['tex2lyx' in x for x in targets] \
     or 'install' in targets or 'all' in targets
 build_lyxbase = build_lyx or 'lyxbase' in targets
 build_po = 'po' in targets or 'install' in targets or 'all' in targets
-build_qt2 = (build_lyx and frontend == 'qt2') or 'qt2' in targets
 build_qt3 = (build_lyx and frontend == 'qt3') or 'qt3' in targets
 build_qt4 = (build_lyx and frontend == 'qt4') or 'qt4' in targets
 build_msvs_projects = use_vc and 'msvs_projects' in targets
 
 
 # now, if rebuild_targets is specified, do not rebuild some targets
-rebuild_targets = rebuild_targets
-if rebuild_targets:
+if rebuild_targets is not None:
+    #
     def ifBuildLib(name, libname, old_value):
         # explicitly asked to rebuild
         if name in rebuild_targets:
@@ -1466,14 +1548,24 @@ if rebuild_targets:
     build_graphics = ifBuildLib('graphics', 'graphics', build_graphics)
     build_controllers = ifBuildLib('controllers', 'controllers', build_controllers)
     build_lyxbase = ifBuildLib('lyxbase', 'lyxbase_pre', build_lyxbase)
-    build_qt2 = ifBuildLib('qt2', 'qt2', build_qt2)
     build_qt3 = ifBuildLib('qt3', 'qt3', build_qt3)
     build_qt4 = ifBuildLib('qt4', 'qt4', build_qt4)
+    #
+    def ifBuildApp(name, appname, old_value):
+        # explicitly asked to rebuild
+        if name in rebuild_targets:
+            return True
+        # else if not rebuild, and if the library already exists
+        elif appExists(name, appname):
+            return False
+        # do not change the original value
+        else:
+            return old_value
+    build_tex2lyx = ifBuildApp('tex2lyx', 'tex2lyx', build_tex2lyx)
+    build_client = ifBuildApp('client', 'lyxclient', build_client)
 
 # sync frontend and frontend (maybe build qt4 with frontend=qt3)
-if build_qt2:
-    frontend = 'qt2'
-elif build_qt3:
+if build_qt3:
     frontend = 'qt3'
 elif build_qt4:
     frontend = 'qt4'
@@ -1496,8 +1588,7 @@ if build_boost:
         print 'Processing files in boost/libs/%s/src...' % lib
         boostlib = boostenv.StaticLibrary(
             target = '$LOCALLIBPATH/included_boost_%s' % lib,
-            source = utils.globSource(dir = env.subst('$TOP_SRCDIR/boost/libs/%s/src' % lib),
-                pattern = '*.cpp', build_dir = '$BUILDDIR/boost/%s/src' % lib)
+            source = ['$BUILDDIR/boost/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)]
         )
         Alias('boost', boostlib)
 
@@ -1539,9 +1630,7 @@ if build_intl:
     intl = intlenv.StaticLibrary(
         target = '$LOCALLIBPATH/included_intl',
         LIBS = ['c'],
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/intl'), pattern = '*.c',
-            exclude = ['vasnprintf.c', 'printf-parse.c', 'printf-args.c', 'os2compat.c'],
-            build_dir = '$BUILDDIR/intl')
+        source = ['$BUILDDIR/intl/%s' % x for x in intl_files]
     )
     Alias('intl', intl)
 
@@ -1562,9 +1651,7 @@ if build_support:
 
     support = env.StaticLibrary(
         target = '$LOCALLIBPATH/support',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/support'), pattern = lyx_ext,
-            exclude = ['os_win32.C', 'os_unix.C', 'os_cygwin.C', 'os_os2.C', 'atexit.c'],
-            include = ['package.C'], build_dir = '$BUILDDIR/common/support')
+        source = ['$BUILDDIR/common/support/%s' % x for x in src_support_files]
     )
     Alias('support', support)
 
@@ -1577,10 +1664,7 @@ if build_mathed:
     #
     mathed = env.StaticLibrary(
         target = '$LOCALLIBPATH/mathed',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/mathed'),
-            pattern = lyx_ext,
-            exclude = ['math_xyarrowinset.C', 'math_mboxinset.C', 'formulamacro.C'],
-            build_dir = '$BUILDDIR/common/mathed')
+        source = ['$BUILDDIR/common/mathed/%s' % x for x in src_mathed_files]
     )
     Alias('mathed', mathed)
 
@@ -1593,9 +1677,7 @@ if build_insets:
     #
     insets = env.StaticLibrary(
         target = '$LOCALLIBPATH/insets',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/insets'),
-            pattern = lyx_ext,
-            exclude = ['insettheorem.C'], build_dir = '$BUILDDIR/common/insets')
+        source = ['$BUILDDIR/common/insets/%s' % x for x in src_insets_files]
     )
     Alias('insets', insets)
 
@@ -1608,8 +1690,7 @@ if build_frontends:
 
     frontends = env.StaticLibrary(
         target = '$LOCALLIBPATH/frontends',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends'), pattern = lyx_ext,
-            build_dir = '$BUILDDIR/common/frontends')
+        source = ['$BUILDDIR/common/frontends/%s' % x for x in src_frontends_files]
     )
     Alias('frontends', frontends)
 
@@ -1622,8 +1703,7 @@ if build_graphics:
 
     graphics = env.StaticLibrary(
         target = '$LOCALLIBPATH/graphics',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/graphics'), pattern = lyx_ext,
-            build_dir = '$BUILDDIR/common/graphics')
+        source = ['$BUILDDIR/common/graphics/%s' % x for x in src_graphics_files]
     )
     Alias('graphics', graphics)
 
@@ -1636,116 +1716,17 @@ if build_controllers:
 
     controllers = env.StaticLibrary(
         target = '$LOCALLIBPATH/controllers',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/controllers'), pattern = lyx_ext,
-            build_dir = '$BUILDDIR/common/frontends/controllers')
+        source = ['$BUILDDIR/common/frontends/controllers/%s' % x for x in src_frontends_controllers_files]
     )
     Alias('controllers', controllers)
 
 
 #
-# src/frontend/qt2/3/4
+# src/frontend/qt3/4
 #
-if build_qt2 or build_qt3 or build_qt4:
+if build_qt3 or build_qt4:
     env.BuildDir('$BUILDDIR/$frontend', '$TOP_SRCDIR/src/frontend/$frontend', duplicate = 0)
 
-
-if build_qt2:
-    print "Processing files in src/frontends/qt2..."
-
-    qt2env = env.Copy()
-    # disable auto scan to speed up non build time
-    qt2env['QT_AUTOSCAN'] = 0
-    qt2env['QT_MOCHPREFIX'] = ''
-
-    # load qt2 tools
-    qt2env.Tool('qt')
-
-    qt2env.AppendUnique(CPPPATH = [
-        '$BUILDDIR/common',
-        '$BUILDDIR/common/images',
-        '$BUILDDIR/common/frontends',
-        '$BUILDDIR/common/frontends/qt2',
-        '$BUILDDIR/common/frontends/controllers',
-        qt_inc_path]
-    )
-
-    qt2_moc_files = ["$BUILDDIR/common/frontends/qt2/%s" % x for x in Split('''
-        BulletsModule.C
-        emptytable.C
-        FileDialog_private.C
-        floatplacement.C
-        iconpalette.C
-        lengthcombo.C
-        panelstack.C
-        QAboutDialog.C
-        QBibitemDialog.C
-        QBibtexDialog.C
-        QBoxDialog.C
-        QBranchDialog.C
-        QBrowseBox.C
-        QChangesDialog.C
-        QCharacterDialog.C
-        QCitationDialog.C
-        QCommandBuffer.C
-        QCommandEdit.C
-        QContentPane.C
-        QDelimiterDialog.C
-        QDocumentDialog.C
-        QErrorListDialog.C
-        QERTDialog.C
-        QExternalDialog.C
-        QFloatDialog.C
-        QGraphicsDialog.C
-        QIncludeDialog.C
-        QIndexDialog.C
-        QLogDialog.C
-        QLPopupMenu.C
-        QLPrintDialog.C
-        QMathDialog.C
-        QMathMatrixDialog.C
-        QNoteDialog.C
-        QParagraphDialog.C
-        QPrefsDialog.C
-        QRefDialog.C
-        QSearchDialog.C
-        QSendtoDialog.C
-        qsetborder.C
-        QShowFileDialog.C
-        QSpellcheckerDialog.C
-        QDialogView.C
-        QTabularCreateDialog.C
-        QTabularDialog.C
-        QTexinfoDialog.C
-        QThesaurusDialog.C
-        QTocDialog.C
-        qttableview.C
-        QtView.C
-        QURLDialog.C
-        QVSpaceDialog.C
-        QWrapDialog.C
-        QLToolbar.C
-        socket_callback.C
-        validators.C
-    ''')]
-
-    # manually moc and uic files for better performance
-    qt2_moced_files = [qt2env.Moc(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt2_moc_files]
-
-    qt2_uiced_files = [qt2env.Uic('$BUILDDIR/common/frontends/qt2/ui/'+x) for x in \
-        utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/qt2/ui'), pattern = '*.ui')]
-
-    qt2_uiced_cc_files = []
-    for x in qt2_uiced_files:
-        qt2_uiced_cc_files.extend(x[1:])
-
-    qt2 = qt2env.StaticLibrary(
-        target = '$LOCALLIBPATH/qt2',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/qt2/'), pattern = lyx_ext,
-            build_dir = '$BUILDDIR/common/frontends/qt2') + qt2_moced_files + qt2_uiced_cc_files
-    )
-    Alias('qt2', qt2)
-
-
 if build_qt3:
     print "Processing files in src/frontends/qt3..."
 
@@ -1766,71 +1747,13 @@ if build_qt3:
         qt_inc_path]
     )
 
-    qt3_moc_files = ["$BUILDDIR/common/frontends/qt3/%s" % x for x in Split('''
-        BulletsModule.C
-        emptytable.C
-        FileDialog_private.C
-        floatplacement.C
-        iconpalette.C
-        lengthcombo.C
-        panelstack.C
-        QAboutDialog.C
-        QBibitemDialog.C
-        QBibtexDialog.C
-        QBoxDialog.C
-        QBranchDialog.C
-        QBrowseBox.C
-        QChangesDialog.C
-        QCharacterDialog.C
-        QCitationDialog.C
-        QCommandBuffer.C
-        QCommandEdit.C
-        QContentPane.C
-        QDelimiterDialog.C
-        QDocumentDialog.C
-        QErrorListDialog.C
-        QERTDialog.C
-        QExternalDialog.C
-        QFloatDialog.C
-        QGraphicsDialog.C
-        QIncludeDialog.C
-        QIndexDialog.C
-        QLogDialog.C
-        QViewSourceDialog.C
-        QLPopupMenu.C
-        QLPrintDialog.C
-        QMathDialog.C
-        QMathMatrixDialog.C
-        QNoteDialog.C
-        QParagraphDialog.C
-        QPrefsDialog.C
-        QRefDialog.C
-        QSearchDialog.C
-        QSendtoDialog.C
-        qsetborder.C
-        QShowFileDialog.C
-        QSpellcheckerDialog.C
-        QDialogView.C
-        QTabularCreateDialog.C
-        QTabularDialog.C
-        QTexinfoDialog.C
-        QThesaurusDialog.C
-        QTocDialog.C
-        qttableview.C
-        QtView.C
-        QURLDialog.C
-        QVSpaceDialog.C
-        QWrapDialog.C
-        QLToolbar.C
-        socket_callback.C
-        validators.C
-    ''')]
-
+    qt3_moc_files = ["$BUILDDIR/common/frontends/qt3/%s" % x for x in src_frontends_qt3_moc_files]
+    
     # manually moc and uic files for better performance
     qt3_moced_files = [qt3env.Moc(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt3_moc_files]
 
     qt3_uiced_files = [qt3env.Uic('$BUILDDIR/common/frontends/qt3/ui/'+x) for x in \
-        utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/qt3/ui'), pattern = '*.ui')]
+        src_frontends_qt3_ui_files]
 
     qt3_uiced_cc_files = []
     for x in qt3_uiced_files:
@@ -1838,8 +1761,8 @@ if build_qt3:
 
     qt3 = qt3env.StaticLibrary(
         target = '$LOCALLIBPATH/qt3',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/qt3/'), pattern = lyx_ext,
-            build_dir = '$BUILDDIR/common/frontends/qt3') + qt3_moced_files + qt3_uiced_cc_files
+        source = ['$BUILDDIR/common/frontends/qt3/%s' % x for x in src_frontends_qt3_files] \
+            + qt3_uiced_cc_files
     )
     Alias('qt3', qt3)
 
@@ -1875,81 +1798,18 @@ if build_qt4:
         '-DQT_CLEAN_NAMESPACE',
         '-DQT_GENUINE_STR',
         '-DQT_NO_STL',
-        '-DQT3_SUPPORT',
+        '-DQT_NO_KEYWORDS',
         ]
     )
 
 
-    qt4_moc_files = ["$BUILDDIR/common/frontends/qt4/%s" % x for x in Split('''
-        BulletsModule.C
-        emptytable.C
-        FileDialog_private.C
-        floatplacement.C
-        iconpalette.C
-        lengthcombo.C
-        InsertTableWidget.C
-        panelstack.C
-        QAboutDialog.C
-        QBibitemDialog.C
-        QBibtexDialog.C
-        QBoxDialog.C
-        QBranchDialog.C
-        QBranches.C
-        QChangesDialog.C
-        QCharacterDialog.C
-        QCitationDialog.C
-        QCommandBuffer.C
-        QCommandEdit.C
-        QDelimiterDialog.C
-        QDocumentDialog.C
-        QErrorListDialog.C
-        QERTDialog.C
-        QExternalDialog.C
-        QFloatDialog.C
-        QGraphicsDialog.C
-        QIncludeDialog.C
-        QIndexDialog.C
-        Action.C
-        QLogDialog.C
-        QViewSourceDialog.C
-        QViewSource.C
-        QLMenubar.C
-        QLPopupMenu.C
-        QLPrintDialog.C
-        QMathDialog.C
-        QMathMatrixDialog.C
-        QNoteDialog.C
-        QParagraphDialog.C
-        QPrefsDialog.C
-        QRefDialog.C
-        QSearchDialog.C
-        QSendtoDialog.C
-        qsetborder.C
-        QShowFileDialog.C
-        QSpellcheckerDialog.C
-        QDialogView.C
-        QTabularCreateDialog.C
-        QTabularDialog.C
-        QTexinfoDialog.C
-        QThesaurusDialog.C
-        TocModel.C
-        QTocDialog.C
-        GuiView.C
-        QURLDialog.C
-        QVSpaceDialog.C
-        GuiWorkArea.C
-        QWrapDialog.C
-        QLToolbar.C
-        socket_callback.C
-        validators.C
-    ''') ]
+    qt4_moc_files = ["$BUILDDIR/common/frontends/qt4/%s" % x for x in src_frontends_qt4_moc_files]
 
     #
     # Compile resources
     #
     resources = [qt4env.Uic4(x.split('.')[0]) for x in \
-        utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/qt4/ui'), pattern = '*.ui',
-            build_dir = '$BUILDDIR/common/frontends/qt4/ui')]
+        ["$BUILDDIR/common/frontends/qt4/ui/%s" % x for x in src_frontends_qt4_ui_files]]
 
     #
     # moc qt4_moc_files, the moced files are included in the original files
@@ -1958,8 +1818,7 @@ if build_qt4:
 
     qt4 = qt4env.StaticLibrary(
         target = '$LOCALLIBPATH/qt4',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/frontends/qt4'), pattern = lyx_ext,
-            exclude = ['QBrowseBox.C'], build_dir = '$BUILDDIR/common/frontends/qt4')
+        source = ['$BUILDDIR/common/frontends/qt4/%s' % x for x in src_frontends_qt4_files]
     )
     Alias('qt4', qt4)
 
@@ -1977,14 +1836,19 @@ if build_client:
             target = '$BUILDDIR/common/client/lyxclient',
             LIBS = ['support'] + intl_libs + system_libs +
                 socket_libs + boost_libraries,
-            source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/client'), pattern = lyx_ext,
-                build_dir = '$BUILDDIR/common/client')
+            source = ['$BUILDDIR/common/client/%s' % x for x in src_client_files]
         )
         Alias('client', env.Command(os.path.join('$BUILDDIR', os.path.split(str(client[0]))[1]),
             client, [Copy('$TARGET', '$SOURCE')]))
     else:
         client = None
     Alias('client', client)
+else:
+    if env['HAVE_FCNTL']:
+        # define client even if lyxclient is not built with rebuild=no
+        client = [env.subst('$BUILDDIR/common/client/${PROGPREFIX}lyxclient$PROGSUFFIX')]
+    else:
+        client = None
 
 
 if build_tex2lyx:
@@ -2006,14 +1870,14 @@ if build_tex2lyx:
     tex2lyx = tex2lyx_env.Program(
         target = '$BUILDDIR/common/tex2lyx/tex2lyx',
         LIBS = ['support'] + boost_libraries + system_libs,
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src/tex2lyx'), pattern = lyx_ext,
-            include = ['FloatList.C', 'Floating.C', 'counters.C', 'lyxlayout.C',
-                'lyxtextclass.C', 'lyxlex.C', 'lyxlex_pimpl.C'],
-            build_dir = '$BUILDDIR/common/tex2lyx')
+        source = ['$BUILDDIR/common/tex2lyx/%s' % x for x in src_tex2lyx_files]
     )
     Alias('tex2lyx', env.Command(os.path.join('$BUILDDIR', os.path.split(str(tex2lyx[0]))[1]),
         tex2lyx, [Copy('$TARGET', '$SOURCE')]))
     Alias('tex2lyx', tex2lyx)
+else:
+    # define tex2lyx even if tex2lyx is not built with rebuild=no
+    tex2lyx = [env.subst('$BUILDDIR/common/tex2lyx/${PROGPREFIX}tex2lyx$PROGSUFFIX')]
 
 
 if build_lyxbase:
@@ -2024,34 +1888,22 @@ if build_lyxbase:
 
     env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
 
-    lyx_post_source = Split('''
-        tabular.C
-        dimension.C
-        PrinterParams.C
-        box.C
-        Thesaurus.C
-        SpellBase.C
-    ''')
-
     if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
-        lyx_post_source.append('aspell.C')
+        src_post_files.append('aspell.C')
     elif env.has_key('USE_PSPELL') and env['USE_PSPELL']:
-        lyx_post_source.append('pspell.C')
+        src_post_files.append('pspell.C')
     elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
-        lyx_post_source.append('ispell.C')
+        src_post_files.append('ispell.C')
 
     # msvc requires at least one source file with main()
     # so I exclude main.C from lyxbase
     lyxbase_pre = env.StaticLibrary(
         target = '$LOCALLIBPATH/lyxbase_pre',
-        source = utils.globSource(dir = env.subst('$TOP_SRCDIR/src'), pattern = lyx_ext,
-            exclude = lyx_post_source + ['main.C', 'aspell.C', 'pspell.C',
-                'ispell.C', 'Variables.C', 'Sectioning.C'],
-            include = ['version.C'], build_dir = '$BUILDDIR/common')
+        source = ['$BUILDDIR/common/%s' % x for x in src_pre_files]
     )
     lyxbase_post = env.StaticLibrary(
         target = '$LOCALLIBPATH/lyxbase_post',
-        source = ["$BUILDDIR/common/%s" % x for x in lyx_post_source]
+        source = ["$BUILDDIR/common/%s" % x for x in src_post_files]
     )
     Alias('lyxbase', lyxbase_pre)
     Alias('lyxbase', lyxbase_post)
@@ -2086,50 +1938,30 @@ if build_lyx:
     Alias('lyx', env.Command(os.path.join('$BUILDDIR', target_name), lyx,
         [Copy('$TARGET', '$SOURCE')]))
     Alias('lyx', lyx)
+else:
+    # define lyx even if lyx is not built with rebuild=no
+    lyx = [env.subst('$BUILDDIR/$frontend/${PROGPREFIX}lyx$PROGSUFFIX')]
 
 
 if build_msvs_projects:
-    def build_project(target, dir, full_target = None,
-        src_pattern = lyx_ext, include = [], resource = None, rebuildTargetOnly = True):
+    def build_project(target, full_target = None,
+        src = [], inc = [], res = [], rebuildTargetOnly = True):
         ''' build mavs project files
             target:      alias (correspond to directory name)
-            dir:         source directory or directories (a list)
             full_target: full path/filename of the target
-            src_pattern: glob pattern
-            include:     files to include into source
-            resource:    directory or directories with resource (.ui) files
+            src:         source files
+            inc:         include files
+            res:         resource files
             rebuildTargetOnly:     whether or not only rebuild this target
 
         For non-debug-able targets like static libraries, target (alias) is
         enough to build the target. For executable targets, msvs need to know
         the full path to start debug them.
         '''
-        if resource is not None:
-            res = utils.globSource(dir = env.subst('$TOP_SRCDIR/'+resource), pattern = '*.ui',
-                build_dir = env.subst('$TOP_SRCDIR/'+resource))
-        else:
-            res = []
         if rebuildTargetOnly:
-            cmds = 'faststart=yes rebuild='+target
+            cmds = 'fast_start=yes rebuild='+target
         else:
-            cmds = 'faststart=yes'
-        if type(dir) == type([]):
-            src = []
-            inc = []
-            for d in dir:
-                src.extend(utils.globSource(dir = env.subst('$TOP_SRCDIR/' + d),
-                    pattern = src_pattern, include = include,
-                    build_dir = env.subst('$TOP_SRCDIR/' + d) ))
-                inc.extend(utils.globSource(dir = env.subst('$TOP_SRCDIR/' + d),
-                    pattern = '*.h',
-                    build_dir = env.subst('$TOP_SRCDIR/' + d) ))
-        else:
-            src = utils.globSource(dir = env.subst('$TOP_SRCDIR/' + dir),
-                pattern = src_pattern, include = include,
-                build_dir = env.subst('$TOP_SRCDIR/' + dir) )
-            inc = utils.globSource(dir = env.subst('$TOP_SRCDIR/' + dir),
-                pattern = '*.h',
-                build_dir = env.subst('$TOP_SRCDIR/' + dir) )
+            cmds = 'fast_start=yes'
         if full_target is None:
             build_target = target
         else:
@@ -2137,55 +1969,104 @@ if build_msvs_projects:
         # project
         proj = env.MSVSProject(
             target = target + env['MSVSPROJECTSUFFIX'],
-            srcs = src,
+            # this allows easy access to header files (along with source)
+            srcs = [env.subst(x) for x in src + inc],
             incs = [env.subst('$TOP_SRCDIR/src/config.h')],
-            localincs = inc,
-            resources = res,
+            localincs = [env.subst(x) for x in inc],
+            resources = [env.subst(x) for x in res],
             buildtarget = build_target,
             cmdargs = cmds,
             variant = 'Debug'
         )
         Alias('msvs_projects', proj)
     #
-    build_project('boost', ['boost/libs/%s/src' % x for x in boost_libs],
-        src_pattern = '*.cpp')
+    boost_src = []
+    for lib in boost_libs:
+        boost_src += ['$TOP_SRCDIR/boost/libs/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)]
+    build_project('boost', src = boost_src)
     #
-    build_project('intl', 'intl', src_pattern = '*.c')
+    build_project('intl', src = ['$TOP_SRCDIR/intl/%s' % x for x in intl_files], 
+        inc = ['$TOP_SRCDIR/intl/%s' % x for x in intl_header_files])
     #
-    build_project('support', 'src/support', include=['package.C.in'])
+    build_project('support', src = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files], 
+        inc = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files])
     #
-    build_project('mathed', 'src/mathed')
+    build_project('mathed', src = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files], 
+        inc = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files])
     #
-    build_project('insets', 'src/insets')
+    build_project('insets', src = ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files], 
+        inc = ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files])
     #
-    build_project('frontends', 'src/frontends')
+    build_project('frontends', src = ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files], 
+        inc = ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files])
     #
-    build_project('graphics', 'src/graphics')
+    build_project('graphics', src = ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files], 
+        inc = ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files])
     #
-    build_project('controllers', 'src/frontends/controllers')
+    build_project('controllers', src = ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files], 
+        inc = ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files])
     #
-    build_project('qt3', 'src/frontends/qt3', resource = 'src/frontends/qt3/ui')
+    build_project('qt3', src = ['$TOP_SRCDIR/src/frontends/qt3/%s' % x for x in src_frontends_qt3_files + src_frontends_qt3_moc_files],
+        inc = ['$TOP_SRCDIR/src/frontends/qt3/%s' % x for x in src_frontends_qt3_header_files],
+        res = ['$TOP_SRCDIR/src/frontends/qt3/ui/%s' % x for x in src_frontends_qt3_ui_files])
     #
-    build_project('qt4', 'src/frontends/qt4', resource = 'src/frontends/qt4/ui')
+    build_project('qt4', src = ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files],
+        inc = ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files],
+        res = ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files])
     #
-    build_project('client', 'src/client', rebuildTargetOnly = False,
+    build_project('client', src = ['$TOP_SRCDIR/src/client/%s' % x for x in src_client_files],
+        inc = ['$TOP_SRCDIR/src/client/%s' % x for x in src_client_header_files],
+        rebuildTargetOnly = False,
         full_target = File(env.subst('$BUILDDIR/common/client/lyxclient$PROGSUFFIX')).abspath)
     #
-    build_project('tex2lyx', 'src/tex2lyx', rebuildTargetOnly = False,
+    build_project('tex2lyx', src = ['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_files],
+        inc = ['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_header_files],
+        rebuildTargetOnly = False,
         full_target = File(env.subst('$BUILDDIR/common/tex2lyx/tex2lyx$PROGSUFFIX')).abspath)
     #
-    build_project('lyxbase', 'src')
+    build_project('lyxbase', src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files],
+        inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files])
     #
     if frontend == 'qt3':
-        build_project('lyx', ['src', 'src/support', 'src/mathed', 'src/insets',
-            'src/frontends', 'src/graphics', 'src/frontends/controllers',
-            'src/frontends/qt3'], resource = 'src/frontends/qt3/ui',
+        build_project('lyx', 
+            src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files] + \
+                ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files] + \
+                ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_files] + \
+                ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
+                ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
+                ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \
+                ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \
+                ['$TOP_SRCDIR/src/frontends/qt3/%s' % x for x in src_frontends_qt3_files + src_frontends_qt3_moc_files],
+            inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \
+                ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \
+                ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \
+                ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files] + \
+                ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files] + \
+                ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files] + \
+                ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files] + \
+                ['$TOP_SRCDIR/src/frontends/qt3/%s' % x for x in src_frontends_qt3_header_files],
+            res = ['$TOP_SRCDIR/src/frontends/qt3/ui/%s' % x for x in src_frontends_qt3_ui_files],
             rebuildTargetOnly = False,
             full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath)
     else:
-        build_project('lyx', ['src', 'src/support', 'src/mathed', 'src/insets',
-            'src/frontends', 'src/graphics', 'src/frontends/controllers',
-            'src/frontends/qt4'], resource = 'src/frontends/qt4/ui',
+        build_project('lyx', 
+            src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files] + \
+                ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files] + \
+                ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_files] + \
+                ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
+                ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
+                ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \
+                ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \
+                ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files],
+            inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \
+                ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \
+                ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \
+                ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files] + \
+                ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files] + \
+                ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files] + \
+                ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files] + \
+                ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files],
+            res = ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
             rebuildTargetOnly = False,
             full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath)
 
@@ -2206,13 +2087,13 @@ if build_po:
     if env.has_key('languages'):
         languages = env.make_list(env['lanauges'])
     # use defulat msgfmt
+    gmo_files = []
     if not env['MSGFMT']:
         print 'msgfmt does not exist. Can not process po files'
     else:
         # create a builder
         env['BUILDERS']['Transfiles'] = Builder(action='$MSGFMT $SOURCE -o $TARGET',suffix='.gmo',src_suffix='.po')
         #
-        gmo_files = []
         for f in transfiles:
             # get filename
             fname = os.path.split(f)[1]
@@ -2225,50 +2106,48 @@ if build_po:
 
 if 'install' in targets:
     #
-    # install to DESTDIR or prefix
-    dest_dir = env.Dir(env.get('DESTDIR', prefix)).abspath
-    # if dest_dir is different from prefix.
-    if env.has_key('exec_prefix'):
-        bin_dest_dir = Dir(env['exec_prefix']).abspath
-    else:
-        bin_dest_dir = os.path.join(dest_dir, 'bin')
-    if add_suffix:
-        share_dest_dir = os.path.join(dest_dir, share_dir + program_suffix)
-    else:
-        share_dest_dir = os.path.join(dest_dir, share_dir)
-    man_dest_dir = os.path.join(dest_dir, man_dir)
-    locale_dest_dir = os.path.join(dest_dir, locale_dir)
+    # this part is a bit messy right now. Since scons will provide
+    # --DESTDIR option soon, at least the dest_dir handling can be 
+    # removed later.
+    #
+    # how to join dest_dir and prefix
+    def joinPaths(path1, path2):
+        ''' join path1 and path2, do not use os.path.join because
+            under window, c:\destdir\d:\program is invalid '''
+        if path1 is None:
+            return os.path.normpath(path2)
+        # separate drive letter
+        (drive, path) = os.path.splitdrive(os.path.normpath(path2))
+        # ignore drive letter, so c:\destdir + c:\program = c:\destdir\program
+        return os.path.join(os.path.normpath(path1), path[1:])
+    #
+    # install to dest_dir/prefix
+    dest_dir = env.get('DESTDIR', None)
+    dest_prefix_dir = joinPaths(dest_dir, env.Dir(prefix).abspath)
     # create the directory if needed
-    if not os.path.isdir(dest_dir):
+    if not os.path.isdir(dest_prefix_dir):
         try:
-            os.makedirs(dest_dir)
+            os.makedirs(dest_prefix_dir)
         except:
             pass
-        if not os.path.isdir(dest_dir):
-            print 'Can not create directory', dest_dir
+        if not os.path.isdir(dest_prefix_dir):
+            print 'Can not create directory', dest_prefix_dir
             Exit(3)
     #
+    if env.has_key('exec_prefix'):
+        bin_dest_dir = joinPaths(dest_dir, Dir(env['exec_prefix']).abspath)
+    else:
+        bin_dest_dir = os.path.join(dest_prefix_dir, 'bin')
+    if add_suffix:
+        share_dest_dir = os.path.join(dest_prefix_dir, share_dir + program_suffix)
+    else:
+        share_dest_dir = os.path.join(dest_prefix_dir, share_dir)
+    man_dest_dir = os.path.join(dest_prefix_dir, man_dir)
+    locale_dest_dir = os.path.join(dest_prefix_dir, locale_dir)
+    #
     import glob
     #
-    # do not install these files
-    exclude_list = ['Makefile.am', 'Makefile.in', 'Makefile',
-        'lyx2lyx_version.py', 'lyx2lyx_version.py.in']
-
-    def install(dest, src):
-        ''' recusive installation of src to dest '''
-        # separate file and directory
-        files = filter(lambda x: os.path.isfile(x) and not os.path.split(x)[1] in exclude_list, src)
-        dirs = filter(os.path.isdir, src)
-        # install file
-        env.Install(dest, files)
-        # install directory
-        ins_dir = [dest]
-        for dir in dirs:
-            ins_dir.extend(install(os.path.join(dest, os.path.basename(dir)),
-                glob.glob(os.path.join(dir, '*'))) )
-        return ins_dir
-    #
-    # executables (some of them may be none)
+    # install executables (lyxclient may be None)
     #
     if add_suffix:
         version_suffix = program_suffix
@@ -2300,14 +2179,31 @@ if 'install' in targets:
         Alias('install', target)
     #
     # share/lyx
-    dirs = install(share_dest_dir,
-        [env.subst('$TOP_SRCDIR/lib/') + file for file in ['configure.py', 'encodings',
-        'chkconfig.ltx', 'CREDITS', 'external_templates', 'symbols', 'languages',
-        'lyxrc.example', 'syntax.default', 'bind', 'images', 'layouts', 'scripts',
-        'templates', 'examples', 'kbd', 'lyx2lyx', 'tex', 'clipart', 'doc',  'ui']]
-    )
-    env.substFile(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py',
-        '$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')
+    dirs = []
+    for (dir,files) in [
+            ('.', lib_files),  
+            ('clipart', lib_clipart_files),
+            ('examples', lib_examples_files),
+            ('images', lib_images_files),
+            ('images/math', lib_images_math_files),
+            ('bind', lib_bind_files),
+            ('kbd', lib_kbd_files),
+            ('layouts', lib_layouts_files),
+            ('scripts', lib_scripts_files),
+            ('templates', lib_templates_files),
+            ('tex', lib_tex_files),
+            ('ui', lib_ui_files),
+            ('doc', lib_doc_files),
+            ('lyx2lyx', lib_lyx2lyx_files)]:
+        dirs.append(env.Install(os.path.join(share_dest_dir, dir),
+            [env.subst('$TOP_SRCDIR/lib/%s/%s' % (dir, file)) for file in files]))
+    
+    # lyx1.4.x does not have lyx2lyx_version.py.in
+    if os.path.isfile(env.subst('$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')):
+        # subst and install this file
+        env.substFile(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py',
+            '$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')
+        Alias('install', share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
     Alias('install', dirs)
     # man
     env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'),