* rich text item delegate to draw the layout filter as underline

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index f00363509494310e2a951bf50fe28332029841e0..668859d1ed99a8ee3e75b319916e64bea6fb2117 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -615,7 +615,7 @@ if conf.CheckLib('nsl'):
 
 # check available boost libs (since lyx1.4 does not use iostream)
 boost_libs = []
-for lib in ['signals', 'regex', 'filesystem', 'iostreams']:
+for lib in ['signals', 'regex', 'filesystem']:
     if os.path.isdir(os.path.join(top_src_dir, 'boost', 'libs', lib)):
         boost_libs.append(lib)
 
@@ -753,7 +753,7 @@ utils.createConfigFile(conf,
         #('newapis.h', 'HAVE_NEWAPIS_H', 'c'),
     ],
     custom_tests = [
-        (env.has_key('assertions') and env['assertions'],
+        (env.has_key('assertions') and env['assertions'] and devel_version,
             'ENABLE_ASSERTIONS',
             'Define if you want assertions to be enabled in the code'
         ),
@@ -1499,6 +1499,11 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG
 #
 # src/support
 #
+frontend_env['QT4_MOCHPREFIX'] = ''
+frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
+
+support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x)
+    for x in src_support_header_files ]
 support = frontend_env.StaticLibrary(
     target = '$LOCALLIBPATH/support',
     source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
@@ -1511,7 +1516,7 @@ support = frontend_env.StaticLibrary(
         '-DQT_NO_STL',
         '-DQT_NO_KEYWORDS',
     ],
-    CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
+    CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip']
 )
 Alias('support', support)
 
@@ -1559,9 +1564,6 @@ Alias('graphics', graphics)
 #
 # src/frontend/qt4
 #
-frontend_env['QT4_MOCHPREFIX'] = ''
-frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
-
 # tells scons how to get these moced files, although not all moced files are needed
 # (or are actually generated).
 qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)
@@ -1620,7 +1622,7 @@ Alias('client', client)
 #
 # tex2lyx
 #
-for file in src_tex2lyx_copied_files:
+for file in src_tex2lyx_copied_files + src_tex2lyx_copied_header_files:
     frontend_env.Command('$BUILDDIR/src/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
         [Copy('$TARGET', '$SOURCE')])
 
@@ -1629,7 +1631,7 @@ tex2lyx = frontend_env.Program(
     LIBS = ['support'] + boost_libraries + intl_libs + system_libs + qtcore_lib,
     source = ['$BUILDDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_files + src_tex2lyx_copied_files] + \
         utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/tex2lyx.rc'),
-    CPPPATH = ['$BUILDDIR/src/tex2lyx', '$CPPPATH'],
+    CPPPATH = ['$BUILDDIR/src/tex2lyx', '$BUILDDIR/src', '$CPPPATH'],
     LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'],
     CCFLAGS = ['$CCFLAGS', '-DTEX2LYX'],
 )
@@ -1761,7 +1763,7 @@ if 'update_po' in BUILD_TARGETS:
         ['$TOP_SRCDIR/src/insets/%s' % x for x in  src_insets_header_files + src_insets_files] + \
         ['$TOP_SRCDIR/src/frontends/%s' % x for x in  src_frontends_header_files + src_frontends_files] + \
         ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files + src_graphics_files] + \
-        ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files + src_frontends_qt4_moc_files] + \
+        ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files] + \
         ['$TOP_SRCDIR/src/client/%s' % x for x in src_client_header_files + src_client_files ]  + \
         ['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_header_files + src_tex2lyx_files ]
     )
@@ -1943,10 +1945,10 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('doc/de', lib_doc_de_files),
             ('doc/de/clipart', lib_doc_de_clipart_files),
             ('doc/es', lib_doc_es_files),
-            ('doc/es/biblio', lib_doc_es_biblio_files),
             ('doc/es/clipart', lib_doc_es_clipart_files),
             ('doc/eu', lib_doc_eu_files),
             ('doc/fr', lib_doc_fr_files),
+            ('doc/fr/clipart', lib_doc_fr_clipart_files),
             ('doc/he', lib_doc_he_files),
             ('doc/hu', lib_doc_hu_files),
             ('doc/it', lib_doc_it_files),
@@ -1971,6 +1973,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('examples/he', lib_examples_he_files),
             ('examples/hu', lib_examples_hu_files),
             ('examples/it', lib_examples_it_files),
+            ('examples/ja', lib_examples_ja_files),
             ('examples/nl', lib_examples_nl_files),
             ('examples/pl', lib_examples_pl_files),
             ('examples/pt', lib_examples_pt_files),