X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2FMakefile.am;h=d5ec00d7eb134af8c5c17baeb4aa40afd30dc70b;hb=1a6e951b4f876307548f05c36236461d2104d87d;hp=b729a6f2b89ccd238b328340471933513b298ad1;hpb=cbb59eef297f85102ed2b0c389beae7aa5eee8e1;p=lyx.git

diff --git a/boost/Makefile.am b/boost/Makefile.am
index b729a6f2b8..d5ec00d7eb 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,12 +1,14 @@
 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
+
 AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>" 
 AM_CPPFLAGS +=  $(BOOST_INCLUDES)
 
@@ -14,7 +16,7 @@ AM_CPPFLAGS +=  $(BOOST_INCLUDES)
 
 if MONOLITHIC_BOOST
 
-liblyxboost_la_SOURCES = \
+liblyxboost_a_SOURCES = \
 	lyxboost.cpp \
 	libs/regex/src/instances.cpp \
 	libs/regex/src/cpp_regex_traits.cpp \
@@ -22,26 +24,21 @@ liblyxboost_la_SOURCES = \
 
 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 \
+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 \
 	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/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 \