X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2FMakefile.am;h=69198704d99c94d1c794037e8826d237d508a075;hb=23e8db3e5ca15a71b03e07c3ba12219912ea904e;hp=810347d144d1bcef2495d2e87121eb9efa8a8b12;hpb=67e61a395698fdfc8a50d2af593b1c2dd89ac018;p=lyx.git

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 810347d144..69198704d9 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,43 +1,80 @@
 include $(top_srcdir)/config/common.am
 
-pkglib_LTLIBRARIES = liblyxboost.la
+noinst_LIBRARIES = liblyxboost.a
 
-EXTRA_DIST = pch.h
+# Using precompiled headers makes compilation >10% slower
+#EXTRA_DIST = pch.h
+#BUILT_SOURCES = $(PCH_FILE)
+#AM_CPPFLAGS += $(PCH_FLAGS)
 
-BUILT_SOURCES = $(PCH_FILE)
+EXTRA_DIST = boost \
+	CMakeLists.txt \
+	libs/CMakeLists.txt \
+	libs/regex/CMakeLists.txt \
+	libs/regex/regex.vcproj \
+	libs/regex/src/CMakeLists.txt \
+	libs/signals/CMakeLists.txt \
+	libs/signals/signals.vcproj \
+	libs/signals/src/CMakeLists.txt
 
-AM_CPPFLAGS += $(PCH_FLAGS)
 AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>" 
 AM_CPPFLAGS +=  $(BOOST_INCLUDES)
 
-liblyxboost_la_SOURCES = \
-	\
-	libs/iostreams/src/file_descriptor.cpp \
-	libs/iostreams/src/mapped_file.cpp \
-	libs/iostreams/src/zlib.cpp \
-	\
-	libs/filesystem/src/exception.cpp \
-	libs/filesystem/src/operations.cpp \
-	libs/filesystem/src/path.cpp \
-	libs/filesystem/src/portability.cpp \
-	\
+# This version is more than three times faster than the one below
+
+if MONOLITHIC_BOOST
+
+if LYX_USE_STD_REGEX
+
+liblyxboost_a_SOURCES = \
+	lyxboostsignals.cpp
+
+else
+
+liblyxboost_a_SOURCES = \
+	lyxboost.cpp \
+	libs/regex/src/instances.cpp \
 	libs/regex/src/cpp_regex_traits.cpp \
+	libs/regex/src/c_regex_traits.cpp 
+
+endif #LYX_USE_STD_REGEX
+
+else
+
+if LYX_USE_STD_REGEX
+
+liblyxboost_a_SOURCES = \
+	libs/signals/src/connection.cpp \
+	libs/signals/src/named_slot_map.cpp \
+	libs/signals/src/signal_base.cpp \
+	libs/signals/src/slot.cpp \
+	libs/signals/src/trackable.cpp
+
+else
+
+liblyxboost_a_SOURCES = \
+	libs/regex/src/internals.hpp \
 	libs/regex/src/c_regex_traits.cpp \
+	libs/regex/src/cpp_regex_traits.cpp \
 	libs/regex/src/cregex.cpp \
 	libs/regex/src/fileiter.cpp \
 	libs/regex/src/instances.cpp \
+	libs/regex/src/posix_api.cpp \
 	libs/regex/src/regex.cpp \
+	libs/regex/src/regex_debug.cpp \
 	libs/regex/src/regex_raw_buffer.cpp \
 	libs/regex/src/regex_traits_defaults.cpp \
 	libs/regex/src/w32_regex_traits.cpp \
-	libs/regex/src/posix_api.cpp \
 	libs/regex/src/wide_posix_api.cpp \
-	libs/regex/src/regex_debug.cpp \
 	libs/regex/src/winstances.cpp \
-	\
+	libs/regex/src/static_mutex.cpp \
 	libs/signals/src/connection.cpp \
 	libs/signals/src/named_slot_map.cpp \
 	libs/signals/src/signal_base.cpp \
 	libs/signals/src/slot.cpp \
 	libs/signals/src/trackable.cpp
 
+endif #LYX_USE_STD_REGEX
+
+
+endif #MONOLITHIC_BOOST