X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2FMakefile.am;h=c8bdf49a473ee647de43caaf6a1b035b35719eca;hb=c48091f33a773732fa6c789927e5833e44108d9d;hp=60d517510d749650a1fabf97dca5169154f25c84;hpb=f6aaac088c411f6d03bab73695b14a5441ea85b1;p=lyx.git

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 60d517510d..c8bdf49a47 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,7 +1,49 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
-SUBDIRS = libs
-ETAGS_ARGS = --lang=c++
+include $(top_srcdir)/config/common.am
+
+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)
+
+# This version is more than three times faster than the one below
+
+if MONOLITHIC_BOOST
+
+liblyxboost_a_SOURCES = \
+	lyxboost.cpp \
+	libs/regex/src/instances.cpp \
+	libs/regex/src/cpp_regex_traits.cpp \
+	libs/regex/src/c_regex_traits.cpp 
+
+else
+
+liblyxboost_a_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