mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-03 08:28:25 +00:00
update SCons
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20858 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
eb95d6bb59
commit
ded6db3e0b
@ -1555,16 +1555,6 @@ graphics = env.StaticLibrary(
|
|||||||
Alias('graphics', graphics)
|
Alias('graphics', graphics)
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# src/frontends/controllers
|
|
||||||
#
|
|
||||||
controllers = env.StaticLibrary(
|
|
||||||
target = '$LOCALLIBPATH/controllers',
|
|
||||||
source = ['$BUILDDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files]
|
|
||||||
)
|
|
||||||
Alias('controllers', controllers)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# src/frontend/qt4
|
# src/frontend/qt4
|
||||||
#
|
#
|
||||||
@ -1591,7 +1581,6 @@ qt4 = frontend_env.StaticLibrary(
|
|||||||
'$BUILDDIR/src/frontends',
|
'$BUILDDIR/src/frontends',
|
||||||
'$BUILDDIR/src/frontends/qt4',
|
'$BUILDDIR/src/frontends/qt4',
|
||||||
'$BUILDDIR/src/frontends/qt4/ui',
|
'$BUILDDIR/src/frontends/qt4/ui',
|
||||||
'$BUILDDIR/src/frontends/controllers'
|
|
||||||
],
|
],
|
||||||
CCFLAGS = [
|
CCFLAGS = [
|
||||||
'$CCFLAGS',
|
'$CCFLAGS',
|
||||||
@ -1681,7 +1670,6 @@ lyx = frontend_env.Program(
|
|||||||
'insets',
|
'insets',
|
||||||
'frontends',
|
'frontends',
|
||||||
frontend,
|
frontend,
|
||||||
'controllers',
|
|
||||||
'graphics',
|
'graphics',
|
||||||
'support',
|
'support',
|
||||||
'lyxbase_post',
|
'lyxbase_post',
|
||||||
@ -1736,7 +1724,6 @@ if use_vc and 'msvs_projects' in BUILD_TARGETS:
|
|||||||
['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_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/frontends/%s' % x for x in src_frontends_files] + \
|
||||||
['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_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],
|
['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files],
|
||||||
inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_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/support/%s' % x for x in src_support_header_files] + \
|
||||||
@ -1744,7 +1731,6 @@ if use_vc and 'msvs_projects' in BUILD_TARGETS:
|
|||||||
['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_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/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/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],
|
['$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],
|
res = ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
|
||||||
full_target = File(env.subst('$BUILDDIR/lyx$PROGSUFFIX')).abspath)
|
full_target = File(env.subst('$BUILDDIR/lyx$PROGSUFFIX')).abspath)
|
||||||
@ -1770,7 +1756,6 @@ 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/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/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/graphics/%s' % x for x in src_graphics_header_files + src_graphics_files] + \
|
||||||
['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files + src_frontends_controllers_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 + src_frontends_qt4_moc_files] + \
|
||||||
['$TOP_SRCDIR/src/client/%s' % x for x in src_client_header_files + src_client_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 ]
|
['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_header_files + src_tex2lyx_files ]
|
||||||
|
@ -712,14 +712,6 @@ src_frontends_extra_files = Split('''
|
|||||||
''')
|
''')
|
||||||
|
|
||||||
|
|
||||||
src_frontends_controllers_header_files = Split('''
|
|
||||||
''')
|
|
||||||
|
|
||||||
|
|
||||||
src_frontends_controllers_files = Split('''
|
|
||||||
''')
|
|
||||||
|
|
||||||
|
|
||||||
src_frontends_controllers_extra_files = Split('''
|
src_frontends_controllers_extra_files = Split('''
|
||||||
Makefile.am
|
Makefile.am
|
||||||
pch.h
|
pch.h
|
||||||
|
Loading…
Reference in New Issue
Block a user