From: Bo Peng <bpeng@lyx.org>
Date: Mon, 27 Aug 2007 15:13:45 +0000 (+0000)
Subject: Scons: fix tex2lyx
X-Git-Tag: 1.6.10~8678
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b1e84ddec3237c867b439a0cea715c417214775a;p=lyx.git

Scons: fix tex2lyx

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19836 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 20113f0dbe..a4dba6975d 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1623,7 +1623,7 @@ Alias('client', client)
 #
 # tex2lyx
 #
-for file in src_tex2lyx_copied_files + src_tex2lyx_copied_header_files:
+for file in src_tex2lyx_copied_files:
     frontend_env.Command('$BUILDDIR/src/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
         [Copy('$TARGET', '$SOURCE')])
 
@@ -1634,6 +1634,7 @@ tex2lyx = frontend_env.Program(
         utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/tex2lyx.rc'),
     CPPPATH = ['$BUILDDIR/src/tex2lyx', '$CPPPATH'],
     LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'],
+    CCFLAGS = ['$CCFLAGS', '-DTEX2LYX'],
 )
 Alias('tex2lyx', frontend_env.Command(os.path.join('$BUILDDIR', os.path.split(str(tex2lyx[0]))[1]),
     tex2lyx, [Copy('$TARGET', '$SOURCE')]))
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 14a0691022..46b1ce039f 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -659,6 +659,7 @@ src_tex2lyx_files = Split('''
 
 
 src_tex2lyx_copied_files = Split('''
+    Color.cpp
     Counters.cpp
     FloatList.cpp
     Floating.cpp
@@ -668,13 +669,6 @@ src_tex2lyx_copied_files = Split('''
 ''')
 
 
-src_tex2lyx_copied_header_files = Split('''
-    Layout.h
-    Lexer.h
-    TextClass.h
-''')
-
-
 src_tex2lyx_extra_files = Split('''
     ChangeLog
     Makefile.am