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

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 58439ff712..69198704d9 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,12 +1,22 @@
 include $(top_srcdir)/config/common.am
 
-pkglib_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 \
+	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)
 
@@ -14,25 +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
 
-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 \
-	\
+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 \
@@ -46,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