mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-24 21:55:29 +00:00
Get rid of monolithic build support for autoconf
It is not useful anymore on modern machines with several cores.
This commit is contained in:
Jean-Marc Lasgouttes
parent
cac27076ea
commit
dd8fd3d90a
14
3rdparty/boost/Makefile.am
vendored
14
3rdparty/boost/Makefile.am
vendored
@ -14,19 +14,6 @@ EXTRA_DIST = boost \
|
||||
AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>"
|
||||
AM_CPPFLAGS += $(BOOST_INCLUDES)
|
||||
|
||||
# This version is more than three times faster than the one below
|
||||
|
||||
if MONOLITHIC_BOOST
|
||||
|
||||
liblyxboost_a_SOURCES = \
|
||||
lyxboost.cpp \
|
||||
libs/regex/src/instances.cpp \
|
||||
libs/regex/src/cpp_regex_traits.cpp \
|
||||
libs/regex/src/c_regex_traits.cpp \
|
||||
libs/regex/src/wc_regex_traits.cpp
|
||||
|
||||
else
|
||||
|
||||
liblyxboost_a_SOURCES = \
|
||||
libs/regex/src/internals.hpp \
|
||||
libs/regex/src/c_regex_traits.cpp \
|
||||
@ -45,5 +32,4 @@ liblyxboost_a_SOURCES = \
|
||||
libs/regex/src/winstances.cpp \
|
||||
libs/regex/src/static_mutex.cpp
|
||||
|
||||
endif #MONOLITHIC_BOOST
|
||||
|
||||
|
||||
13
3rdparty/boost/lyxboost.cpp
vendored
13
3rdparty/boost/lyxboost.cpp
vendored
@ -1,13 +0,0 @@
|
||||
//#include "libs/regex/src/cpp_regex_traits.cpp"
|
||||
//#include "libs/regex/src/c_regex_traits.cpp"
|
||||
#include "libs/regex/src/cregex.cpp"
|
||||
#include "libs/regex/src/fileiter.cpp"
|
||||
//#include "libs/regex/src/instances.cpp"
|
||||
#include "libs/regex/src/regex.cpp"
|
||||
#include "libs/regex/src/regex_raw_buffer.cpp"
|
||||
#include "libs/regex/src/regex_traits_defaults.cpp"
|
||||
#include "libs/regex/src/w32_regex_traits.cpp"
|
||||
#include "libs/regex/src/posix_api.cpp"
|
||||
#include "libs/regex/src/wide_posix_api.cpp"
|
||||
#include "libs/regex/src/regex_debug.cpp"
|
||||
#include "libs/regex/src/winstances.cpp"
|
||||
4
INSTALL
4
INSTALL
@ -234,10 +234,6 @@ The following options allow you to tweak the generated code more precisely (see
|
||||
compile --with-included-hunspell or --disable-stdlib-debug when
|
||||
linking development versions against your system's hunspell library.
|
||||
|
||||
o --enable-monolithic-build[=boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
|
||||
that enables monolithic build of the given parts of the source
|
||||
code. This should reduce the compilation time provided you have
|
||||
enough memory (>500MB).
|
||||
|
||||
|
||||
Compiling and installing LyX
|
||||
|
||||
22
configure.ac
22
configure.ac
@ -34,28 +34,6 @@ save_PACKAGE=$PACKAGE
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 tar-ustar subdir-objects])
|
||||
PACKAGE=$save_PACKAGE
|
||||
|
||||
# Allow to build some parts of the code as one big chunk
|
||||
m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt])
|
||||
AC_ARG_ENABLE(monolithic-build,
|
||||
AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@],
|
||||
[Use monolithic build for modules in LIST (default: ALLPARTS)]),
|
||||
[test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS"
|
||||
test "$enable_monolithic_build" = no && enable_monolithic_build=
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=" ,"
|
||||
for i in $enable_monolithic_build ; do
|
||||
eval "enable_monolithic_$i=yes"
|
||||
done
|
||||
IFS="$ac_save_ifs"],
|
||||
[enable_monolithic_build=])
|
||||
|
||||
AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes")
|
||||
AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes")
|
||||
AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes")
|
||||
AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
|
||||
AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
|
||||
AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
|
||||
AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT, test "x$enable_monolithic_frontend_qt" = "xyes")
|
||||
|
||||
### Set the execute permissions of the various scripts correctly
|
||||
for file in config/install-sh ; do
|
||||
chmod 755 ${srcdir}/${file}
|
||||
|
||||
@ -322,22 +322,8 @@ lyx_commit_hash.h: update_commit_hash
|
||||
BUILT_SOURCES = lyx_commit_hash.h
|
||||
CLEANFILES = lyx_commit_hash.h
|
||||
|
||||
lyxcore.cpp:
|
||||
$(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include "'$${file}'"' ; done >$@
|
||||
|
||||
if MONOLITHIC_CORE
|
||||
|
||||
BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
|
||||
CLEANFILES += lyxcore.cpp
|
||||
|
||||
nodist_liblyxcore_a_SOURCES = lyxcore.cpp
|
||||
liblyxcore_a_SOURCES = $(STANDALONEFILES) $(HEADERFILESCORE)
|
||||
|
||||
else
|
||||
|
||||
liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
|
||||
|
||||
endif
|
||||
|
||||
######################### Qt stuff ##############################
|
||||
|
||||
@ -541,22 +527,8 @@ HEADERFILESMATHED = \
|
||||
mathed/MathSupport.h \
|
||||
mathed/TextPainter.h
|
||||
|
||||
lyxmathed.cpp:
|
||||
$(AM_V_GEN)for file in $(SOURCEFILESMATHED) ; do echo '#include "'$${file}'"' ; done >$@
|
||||
|
||||
if MONOLITHIC_MATHED
|
||||
|
||||
BUILT_SOURCES += lyxmathed.cpp
|
||||
CLEANFILES += lyxmathed.cpp
|
||||
|
||||
nodist_liblyxmathed_a_SOURCES = lyxmathed.cpp
|
||||
liblyxmathed_a_SOURCES = $(HEADERFILESMATHED)
|
||||
|
||||
else
|
||||
|
||||
liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
|
||||
|
||||
endif
|
||||
|
||||
############################### Insets ##############################
|
||||
|
||||
@ -680,23 +652,8 @@ HEADERFILESINSETS = \
|
||||
insets/InsetVSpace.h \
|
||||
insets/InsetWrap.h
|
||||
|
||||
lyxinsets.cpp:
|
||||
$(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include "'$${file}'"' ; done >$@
|
||||
|
||||
if MONOLITHIC_INSETS
|
||||
|
||||
BUILT_SOURCES += lyxinsets.cpp
|
||||
CLEANFILES += lyxinsets.cpp
|
||||
|
||||
nodist_liblyxinsets_a_SOURCES = lyxinsets.cpp
|
||||
liblyxinsets_a_SOURCES = $(HEADERFILESINSETS)
|
||||
|
||||
else
|
||||
|
||||
liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
|
||||
|
||||
endif
|
||||
|
||||
|
||||
############################## Tests ##################################
|
||||
|
||||
|
||||
@ -26,21 +26,5 @@ SOURCEFILES = \
|
||||
|
||||
HEADERFILES =
|
||||
|
||||
|
||||
lyxclient.cpp:
|
||||
$(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
|
||||
|
||||
if MONOLITHIC_CLIENT
|
||||
|
||||
AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
|
||||
BUILT_SOURCES = lyxclient.cpp
|
||||
CLEANFILES += lyxclient.cpp
|
||||
|
||||
nodist_lyxclient_SOURCES = lyxclient.cpp
|
||||
lyxclient_SOURCES = $(HEADERFILES)
|
||||
|
||||
else
|
||||
|
||||
lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
|
||||
|
||||
endif
|
||||
|
||||
@ -360,26 +360,9 @@ UIFILES = \
|
||||
|
||||
nodist_liblyxqt4_a_SOURCES = Resources.cpp
|
||||
|
||||
liblyxqt4.cpp:
|
||||
$(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
|
||||
|
||||
if MONOLITHIC_FRONTEND_QT
|
||||
|
||||
nodist_liblyxqt4_a_SOURCES += liblyxqt4.cpp
|
||||
liblyxqt4_a_SOURCES = \
|
||||
$(MOCHEADER) \
|
||||
$(NOMOCHEADER)
|
||||
|
||||
BUILT_SOURCES += liblyxqt4.cpp
|
||||
CLEANFILES += liblyxqt4.cpp
|
||||
|
||||
else
|
||||
|
||||
liblyxqt4_a_SOURCES = \
|
||||
$(SOURCEFILES) \
|
||||
$(MOCHEADER) \
|
||||
$(NOMOCHEADER)
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user