Cmake export tests: Handle attic files with now missing references to png graphics

[lyx.git] / boost / Makefile.am

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 4e52873223bc3f0dbc13e59b868e58a534adf4cc..cfac86b4b95a3abd5c5c5e9d3dc67feb2276c274 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -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 \
@@ -24,16 +19,35 @@ AM_CPPFLAGS +=  $(BOOST_INCLUDES)
 
 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 \
@@ -48,11 +62,14 @@ liblyxboost_a_SOURCES = \
        libs/regex/src/w32_regex_traits.cpp \
        libs/regex/src/wide_posix_api.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
+endif #LYX_USE_STD_REGEX
+
+
+endif #MONOLITHIC_BOOST