fix scons for Andre's recent renames

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 591c27700fb1311b67bd1c9029aa56c4ae05f7d7..f4b81eb6142f3b2d57ddd4a63908d8e2412e3361 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -362,7 +362,7 @@ env.AppendUnique(LIBPATH = ['$LOCALLIBPATH'])
 # 3. compiler commands and flags like CCFLAGS.
 #     MSGFMT used to process po files
 # 4. Variables that will be used to replace variables in some_file.in
-#     src/support/package.C.in:
+#     src/support/Package.C.in:
 #       TOP_SRCDIR, LOCALEDIR, LYX_DIR, PROGRAM_SUFFIX
 #     lib/lyx2lyx/lyx2lyx_version.py.in
 #       PACKAGE_VERSION
@@ -400,12 +400,12 @@ if env.has_key('version_suffix'):
         program_suffix = env['version_suffix']
 else:
     program_suffix = ''
-# used by package.C.in
+# used by Package.C.in
 env['PROGRAM_SUFFIX'] = program_suffix
 
 # whether or not add suffix to file and directory names
 add_suffix = packaging_method != 'windows'
-# LYX_DIR are different (used in package.C.in)
+# LYX_DIR are different (used in Package.C.in)
 if add_suffix:
     env['LYX_DIR'] = Dir(os.path.join(prefix, share_dir + program_suffix)).abspath
 else:
@@ -1639,7 +1639,7 @@ if build_support:
     print "Processing files in src/support..."
 
     frontend_env.Depends('$BUILDDIR/common/support/package.C', '$BUILDDIR/common/config.h')
-    env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/package.C.in')
+    env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/Package.C.in')
 
     support = frontend_env.StaticLibrary(
         target = '$LOCALLIBPATH/support',
@@ -1793,8 +1793,8 @@ if build_tex2lyx:
     print "Processing files in src/tex2lyx..."
 
     #
-    for file in ['FloatList.C', 'Floating.C', 'counters.C', 'lyxlayout.h', 'lyxlayout.C', 
-        'lyxtextclass.h', 'lyxtextclass.C', 'lyxlex.C', 'lyxlex_pimpl.C']:
+    for file in ['FloatList.cpp', 'Floating.cpp', 'Counters.cpp', 'LyXLayout.h', 'LyXLayout.cpp', 
+        'LyXTextClass.h', 'LyXTextClass.cpp', 'Lexer.cpp', 'Lexer.h']:
         frontend_env.Command('$BUILDDIR/common/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
             [Copy('$TARGET', '$SOURCE')])
 
@@ -1824,14 +1824,14 @@ if build_lyxbase:
     env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
 
     if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
-        src_post_files.append('aspell.C')
+        src_post_files.append('ASpell.cpp')
     elif env.has_key('USE_PSPELL') and env['USE_PSPELL']:
-        src_post_files.append('pspell.C')
+        src_post_files.append('PSpell.cpp')
     elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
-        src_post_files.append('ispell.C')
+        src_post_files.append('ISpell.cpp')
 
     # msvc requires at least one source file with main()
-    # so I exclude main.C from lyxbase
+    # so I exclude main.cpp from lyxbase
     lyxbase_pre = env.StaticLibrary(
         target = '$LOCALLIBPATH/lyxbase_pre',
         source = ['$BUILDDIR/common/%s' % x for x in src_pre_files]
@@ -1850,7 +1850,7 @@ if build_lyx:
     #
     lyx = frontend_env.Program(
         target = '$BUILDDIR/lyx',
-        source = ['$BUILDDIR/common/main.C'] + \
+        source = ['$BUILDDIR/common/main.cpp'] + \
             utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/lyx.rc'),
         LIBS = [
             'lyxbase_pre',