* src/frontends/GuiDocument.{cpp,h}:

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 748d5424365484cc2fae8ebad9a8fd0579a66094..c7de1d84b1ca7da8ee1ded54f64f198ca309c785 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -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)
@@ -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),