Fixes and additions to the textcyr macros in unicodesymbols

[lyx.git] / boost / Makefile.am

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 84d6e3a682ea83363e203929736fcfc1c88044f8..69198704d99c94d1c794037e8826d237d508a075 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,13 +1,21 @@
 include $(top_srcdir)/config/common.am
 
-noinst_LTLIBRARIES = liblyxboost.la
+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
+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 += -DBOOST_USER_CONFIG="<config.h>" 
 AM_CPPFLAGS +=  $(BOOST_INCLUDES)
@@ -16,21 +24,36 @@ AM_CPPFLAGS +=  $(BOOST_INCLUDES)
 
 if MONOLITHIC_BOOST
 
-liblyxboost_la_SOURCES = \
+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_la_SOURCES = \
-       \
-       libs/filesystem/src/exception.cpp \
-       libs/filesystem/src/operations.cpp \
-       libs/filesystem/src/path.cpp \
-       libs/filesystem/src/portability.cpp \
-       \
+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 \
@@ -44,11 +67,14 @@ liblyxboost_la_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