some progress on the linking front

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19527 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 4fbbf3d02b53ac40da592535e2ab3b8be59e37b4..b729a6f2b89ccd238b328340471933513b298ad1 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -12,36 +12,42 @@ AM_CPPFLAGS +=  $(BOOST_INCLUDES)
 
 # This version is more than three times faster than the one below
 
-liblyxboost_la_SOURCES = lyxboost.cpp
-
-#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 \
-#      \
-#      libs/regex/src/cpp_regex_traits.cpp \
-#      libs/regex/src/c_regex_traits.cpp \
-#      libs/regex/src/cregex.cpp \
-#      libs/regex/src/fileiter.cpp \
-#      libs/regex/src/instances.cpp \
-#      libs/regex/src/regex.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 \
-#      libs/signals/src/named_slot_map.cpp \
-#      libs/signals/src/signal_base.cpp \
-#      libs/signals/src/slot.cpp \
-#      libs/signals/src/trackable.cpp
+if MONOLITHIC_BOOST
 
+liblyxboost_la_SOURCES = \
+       lyxboost.cpp \
+       libs/regex/src/instances.cpp \
+       libs/regex/src/cpp_regex_traits.cpp \
+       libs/regex/src/c_regex_traits.cpp 
+
+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 \
+       \
+       libs/regex/src/cregex.cpp \
+       libs/regex/src/fileiter.cpp \
+       libs/regex/src/regex.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 \
+       libs/signals/src/named_slot_map.cpp \
+       libs/signals/src/signal_base.cpp \
+       libs/signals/src/slot.cpp \
+       libs/signals/src/trackable.cpp
+
+endif

diff --git a/boost/lyxboost.cpp b/boost/lyxboost.cpp
index f524328fd9ad5ad2e646a9d1cc96fa9e77b02b08..a41e1bd5ad2cacf92b561c9fb5699866b6dabbec 100644 (file)
--- a/boost/lyxboost.cpp
+++ b/boost/lyxboost.cpp
@@ -7,11 +7,11 @@
 #include "libs/filesystem/src/path.cpp"
 #include "libs/filesystem/src/portability.cpp"
 
-#include "libs/regex/src/cpp_regex_traits.cpp"
-#include "libs/regex/src/c_regex_traits.cpp"
+//#include "libs/regex/src/cpp_regex_traits.cpp"
+//#include "libs/regex/src/c_regex_traits.cpp"
 #include "libs/regex/src/cregex.cpp"
 #include "libs/regex/src/fileiter.cpp"
-#include "libs/regex/src/instances.cpp"
+//#include "libs/regex/src/instances.cpp"
 #include "libs/regex/src/regex.cpp"
 #include "libs/regex/src/regex_raw_buffer.cpp"
 #include "libs/regex/src/regex_traits_defaults.cpp"