Added Liviu Andronic, and modified generate_contributions.py to match what was in...

[lyx.git] / boost / Makefile.am

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 4fbbf3d02b53ac40da592535e2ab3b8be59e37b4..770c41a9bd2f5b9b7ebef0c61d235e0cb309e3c1 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,47 +1,49 @@
 include $(top_srcdir)/config/common.am
 
-pkglib_LTLIBRARIES = liblyxboost.la
+noinst_LTLIBRARIES = liblyxboost.la
 
 # Using precompiled headers makes compilation >10% slower
 #EXTRA_DIST = pch.h
 #BUILT_SOURCES = $(PCH_FILE)
 #AM_CPPFLAGS += $(PCH_FLAGS)
 
+EXTRA_DIST = boost
+
 AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>" 
 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/regex/src/c_regex_traits.cpp \
+       libs/regex/src/cpp_regex_traits.cpp \
+       libs/regex/src/cregex.cpp \
+       libs/regex/src/fileiter.cpp \
+       libs/regex/src/instances.cpp \
+       libs/regex/src/posix_api.cpp \
+       libs/regex/src/regex.cpp \
+       libs/regex/src/regex_debug.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/wide_posix_api.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