More tweaks to C++ compiler detection

[lyx.git] / boost / Makefile.am

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 4e52873223bc3f0dbc13e59b868e58a534adf4cc..69198704d99c94d1c794037e8826d237d508a075 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -24,16 +24,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 +67,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