mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Remove support for precompiled headers for autotools
This was turned off by default for a long time, and it does not seem to have any use these days.
This commit is contained in:
Jean-Marc Lasgouttes
parent
7f4101a556
commit
b7909e7e6c
@ -2,11 +2,6 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LIBRARIES = liblyxboost.a
|
||||
|
||||
# Using precompiled headers makes compilation >10% slower
|
||||
#EXTRA_DIST = pch.h
|
||||
#BUILT_SOURCES = $(PCH_FILE)
|
||||
#AM_CPPFLAGS += $(PCH_FLAGS)
|
||||
|
||||
EXTRA_DIST = boost \
|
||||
CMakeLists.txt \
|
||||
libs/CMakeLists.txt \
|
||||
|
||||
28
boost/pch.h
28
boost/pch.h
@ -1,28 +0,0 @@
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/detail/workaround.hpp>
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/signals/connection.hpp>
|
||||
#include <boost/signals/detail/signal_base.hpp>
|
||||
#include <boost/signals/slot.hpp>
|
||||
#include <boost/signals/trackable.hpp>
|
||||
#include <boost/throw_exception.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cctype>
|
||||
#include <cerrno>
|
||||
#include <climits>
|
||||
#include <clocale>
|
||||
#include <cwchar>
|
||||
#include <iostream>
|
||||
#include <list>
|
||||
#include <locale>
|
||||
#include <map>
|
||||
#include <new>
|
||||
#include <ostream>
|
||||
#include <set>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <sys/stat.h> // last_write_time() uses stat()
|
||||
@ -1,6 +1,4 @@
|
||||
CLEANFILES = pch.h.gch
|
||||
|
||||
DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
|
||||
DISTCLEANFILES= *.orig *.rej *~ *.bak core
|
||||
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
|
||||
@ -8,24 +6,4 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
|
||||
|
||||
AM_ETAGSFLAGS = --lang=c++
|
||||
|
||||
if LYX_BUILD_PCH
|
||||
PCH_SOURCE = $(srcdir)/pch.h
|
||||
PCH_FLAGS = -Winvalid-pch --include=$(PCH_SOURCE)
|
||||
PCH_FILE = ./pch.h.gch
|
||||
sinclude ./pch.h.gch.dep
|
||||
|
||||
*.o *.lo *.obj: $(PCH_FILE)
|
||||
|
||||
$(PCH_FILE): $(PCH_SOURCE)
|
||||
$(MAKE) PCH_FLAGS= pch-file
|
||||
|
||||
pch-file:
|
||||
$(CXXCOMPILE) -x c++-header -fPIC -DPIC $(PCH_SOURCE) -o $(PCH_FILE) \
|
||||
-MT $(PCH_FILE) -MD -MP -MF "./$(PCH_FILE).Tdep" \
|
||||
&& mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" \
|
||||
|| rm "./$(PCH_FILE).Tdep"
|
||||
endif
|
||||
|
||||
SUFFIXES = .gch
|
||||
|
||||
LIBS =
|
||||
|
||||
@ -263,11 +263,6 @@ case $enable_optimization in
|
||||
*) lyx_optim=${enable_optimization};;
|
||||
esac
|
||||
|
||||
AC_ARG_ENABLE(pch,
|
||||
AC_HELP_STRING([--enable-pch],[enable precompiled headers]),,
|
||||
enable_pch=no;)
|
||||
lyx_pch_comp=no
|
||||
|
||||
AC_ARG_ENABLE(cxx11,
|
||||
AC_HELP_STRING([--disable-cxx11],[disable C++11 mode (default: enabled for known good compilers)]),,
|
||||
enable_cxx11=auto;)
|
||||
@ -316,7 +311,6 @@ if test x$GXX = xyes; then
|
||||
fi
|
||||
case $gxx_version in
|
||||
2.*|3.*) AC_ERROR([gcc 4.x is required]);;
|
||||
*) test $enable_pch = yes && lyx_pch_comp=yes ;;
|
||||
esac
|
||||
if test x$enable_stdlib_debug = xyes ; then
|
||||
dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
|
||||
@ -381,8 +375,6 @@ if test x$GXX = xyes; then
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes)
|
||||
test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
|
||||
AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
|
||||
])dnl
|
||||
|
||||
dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
|
||||
|
||||
@ -19,7 +19,7 @@ lyxwin_SOURCES = lyxwin.c lyxwinres.rc
|
||||
lyxeditor_LDFLAGS=-mwindows -e _mainCRTStartup
|
||||
lyxwin_LDFLAGS=-mwindows -e _mainCRTStartup
|
||||
|
||||
CLEANFILES += lyxeditor.sh lyx_32x32.ico lyx_doc_32x32.ico
|
||||
CLEANFILES = lyxeditor.sh lyx_32x32.ico lyx_doc_32x32.ico
|
||||
|
||||
lyxeditor.sh:
|
||||
cp $(top_srcdir)/development/tools/lyxeditor $@
|
||||
|
||||
@ -12,7 +12,7 @@ dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
|
||||
|
||||
# We use DATA now instead of PYTHON because automake 1.11.2 complains.
|
||||
# Note that we "chmod 755" manually this file in install-data-hook.
|
||||
dist_pkgdata_DATA += configure.py
|
||||
dist_pkgdata_DATA += configure.py
|
||||
|
||||
dist_noinst_DATA = \
|
||||
appdata.xml \
|
||||
@ -260,7 +260,7 @@ dist_springerexamples_DATA = \
|
||||
examples/springer/svmult_part.lyx \
|
||||
examples/springer/svmult_preface.lyx \
|
||||
examples/springer/svmult_referenc.lyx
|
||||
|
||||
|
||||
thesisexamplesdir = $(pkgdatadir)/examples/thesis
|
||||
dist_thesisexamples_DATA = \
|
||||
examples/thesis/Acknowledgments.lyx \
|
||||
@ -1915,7 +1915,7 @@ dist_imagesclassic_DATA = \
|
||||
images/classic/view-others.png
|
||||
|
||||
imagescommandsdir = $(imagesdir)/commands
|
||||
dist_imagescommands_DATA =
|
||||
dist_imagescommands_DATA =
|
||||
|
||||
kbddir = $(pkgdatadir)/kbd
|
||||
dist_kbd_DATA = \
|
||||
@ -2309,8 +2309,8 @@ lyx@program_suffix@.desktop: lyx.desktop-temp
|
||||
desktopdir = $(datadir)/applications
|
||||
desktop_DATA = lyx@program_suffix@.desktop
|
||||
|
||||
CLEANFILES += lyx@program_suffix@.desktop lyx.desktop-temp \
|
||||
lyx@program_suffix@.svg lyx@program_suffix@.png
|
||||
CLEANFILES = lyx@program_suffix@.desktop lyx.desktop-temp \
|
||||
lyx@program_suffix@.svg lyx@program_suffix@.png
|
||||
endif
|
||||
dist_noinst_DATA += lyx.desktop.in images/lyx.svg images/lyx.png
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/config/common.am
|
||||
|
||||
CLEANFILES += *.pyc *.pyo
|
||||
CLEANFILES = *.pyc *.pyo
|
||||
|
||||
EXTRA_DIST = lyx2lyx_version.py.in test_parser_tools.py CMakeLists.txt
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
############################### Core ##############################
|
||||
|
||||
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
|
||||
AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
|
||||
|
||||
if BUILD_CLIENT_SUBDIR
|
||||
@ -12,7 +12,6 @@ endif
|
||||
SUBDIRS = support frontends . $(CLIENT) tex2lyx
|
||||
|
||||
EXTRA_DIST = lyx_commit_hash.h.in \
|
||||
pch.h \
|
||||
CMakeLists.txt \
|
||||
graphics/CMakeLists.txt \
|
||||
insets/CMakeLists.txt \
|
||||
@ -51,8 +50,6 @@ endif
|
||||
|
||||
#lyx_LDFLAGS=-Wl,-O1
|
||||
|
||||
BUILT_SOURCES = $(PCH_FILE)
|
||||
|
||||
if INSTALL_MACOSX
|
||||
APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
|
||||
endif
|
||||
@ -324,8 +321,8 @@ update_commit_hash:
|
||||
|
||||
lyx_commit_hash.h: update_commit_hash
|
||||
|
||||
BUILT_SOURCES += lyx_commit_hash.h
|
||||
CLEANFILES += lyx_commit_hash.h
|
||||
BUILT_SOURCES = lyx_commit_hash.h
|
||||
CLEANFILES = lyx_commit_hash.h
|
||||
|
||||
lyxcore.cpp:
|
||||
@echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/config/common.am
|
||||
|
||||
CLEANFILES += $(man_MANS)
|
||||
CLEANFILES = $(man_MANS)
|
||||
|
||||
man_MANS = lyxclient.1
|
||||
|
||||
@ -31,7 +31,7 @@ SOURCEFILES = \
|
||||
boost.cpp \
|
||||
client.cpp
|
||||
|
||||
HEADERFILES =
|
||||
HEADERFILES =
|
||||
|
||||
|
||||
lyxclient.cpp:
|
||||
@ -47,10 +47,6 @@ lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
|
||||
|
||||
else
|
||||
|
||||
EXTRA_DIST += pch.h
|
||||
AM_CPPFLAGS += $(PCH_FLAGS)
|
||||
BUILT_SOURCES = $(PCH_FILE)
|
||||
|
||||
lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
|
||||
|
||||
endif
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <cerrno>
|
||||
#include <cstdlib>
|
||||
#include <exception>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@ -4,7 +4,7 @@ BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h)
|
||||
BUILT_SOURCES += $(MOCEDFILES)
|
||||
BUILT_SOURCES += Resources.cpp Resources.qrc
|
||||
|
||||
CLEANFILES += $(BUILT_SOURCES)
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
######################### Qt stuff #############################
|
||||
# Use _() for localization instead of tr() or trUtf8()
|
||||
@ -374,9 +374,6 @@ liblyxqt4_a_SOURCES = \
|
||||
$(MOCHEADER) \
|
||||
$(NOMOCHEADER)
|
||||
|
||||
EXTRA_DIST = pch.h CMakeLists.txt $(UIFILES:%=ui/%)
|
||||
BUILT_SOURCES += $(PCH_FILE)
|
||||
AM_CPPFLAGS += $(PCH_FLAGS)
|
||||
|
||||
EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)
|
||||
|
||||
endif
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <iomanip>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <stack>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <QtCore>
|
||||
#include <QtGui>
|
||||
22
src/pch.h
22
src/pch.h
@ -1,22 +0,0 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <deque>
|
||||
#include <exception>
|
||||
#include <fstream>
|
||||
#include <functional>
|
||||
#include <iomanip>
|
||||
#include <ios>
|
||||
#include <iosfwd>
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
#include <stack>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@ -1,14 +1,10 @@
|
||||
include $(top_srcdir)/config/common.am
|
||||
|
||||
CLEANFILES += $(BUILT_SOURCES)
|
||||
|
||||
EXTRA_DIST = pch.h \
|
||||
os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
|
||||
EXTRA_DIST = os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
|
||||
CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
|
||||
|
||||
noinst_LIBRARIES = liblyxsupport.a
|
||||
|
||||
BUILT_SOURCES = $(PCH_FILE)
|
||||
|
||||
######################### Qt stuff #############################
|
||||
#
|
||||
@ -19,8 +15,8 @@ MOCHEADER = \
|
||||
|
||||
MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
|
||||
|
||||
CLEANFILES += $(MOCEDFILES)
|
||||
BUILT_SOURCES += $(MOCEDFILES)
|
||||
CLEANFILES = $(MOCEDFILES)
|
||||
BUILT_SOURCES = $(MOCEDFILES)
|
||||
|
||||
moc_%.cpp: %.h
|
||||
$(QT_MOC) -o $@ $<
|
||||
@ -30,8 +26,7 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
|
||||
#
|
||||
##################################################################
|
||||
|
||||
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
|
||||
AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_INCLUDES)
|
||||
AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES)
|
||||
|
||||
liblyxsupport_a_SOURCES = \
|
||||
FileMonitor.h \
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <cerrno>
|
||||
#include <csignal>
|
||||
#include <cstddef>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <ctime>
|
||||
#include <fstream>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#include <istream>
|
||||
#include <iterator>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <ostream>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/config/common.am
|
||||
|
||||
EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h \
|
||||
EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) \
|
||||
CMakeLists.txt test/CMakeLists.txt
|
||||
|
||||
#noinst_LIBRARIES = libtexparser.a
|
||||
@ -17,7 +17,7 @@ bin_PROGRAMS = tex2lyx
|
||||
|
||||
DEFAULT_INCLUDES =
|
||||
|
||||
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/src/tex2lyx \
|
||||
-I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
|
||||
$(BOOST_INCLUDES)
|
||||
|
||||
@ -105,8 +105,6 @@ LINKED_FILES = \
|
||||
../TextClass.cpp \
|
||||
../version.cpp
|
||||
|
||||
BUILT_SOURCES = $(PCH_FILE)
|
||||
|
||||
tex2lyx_SOURCES = \
|
||||
$(LINKED_FILES) \
|
||||
boost.cpp \
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
#include <exception>
|
||||
#include <fstream>
|
||||
#include <iosfwd>
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
Loading…
Reference in New Issue
Block a user