Update my email and status.

[lyx.git] / boost / Makefile.am

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 810347d144d1bcef2495d2e87121eb9efa8a8b12..d5ec00d7eb134af8c5c17baeb4aa40afd30dc70b 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,38 +1,44 @@
 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
 
-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
+
+liblyxboost_a_SOURCES = \
+       lyxboost.cpp \
+       libs/regex/src/instances.cpp \
        libs/regex/src/cpp_regex_traits.cpp \
+       libs/regex/src/c_regex_traits.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/signals/src/connection.cpp \
@@ -41,3 +47,4 @@ liblyxboost_la_SOURCES = \
        libs/signals/src/slot.cpp \
        libs/signals/src/trackable.cpp
 
+endif