Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/boostorg/boost.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAntony Polukhin <antoshkka@gmail.com>2015-08-22 09:49:46 +0300
committerAntony Polukhin <antoshkka@gmail.com>2015-12-29 23:27:47 +0300
commitb00958a6fe3a3293bc505cfbf0a266d66bdfe4a9 (patch)
tree3902111382aa3746b174c068e9b2af3379b040d9 /doc
parent02d481350972180679f51b7e1b1d67753a0bc6da (diff)
Boost.DLL library integration
Conflicts merged: doc/Jamfile.v2
Diffstat (limited to 'doc')
-rw-r--r--doc/Jamfile.v23
-rw-r--r--doc/pdf/Jamfile.v23
-rw-r--r--doc/src/boost.xml1
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 36bafcfad2..9e94feecd1 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -43,6 +43,7 @@ boostbook doc
<dependency>../libs/circular_buffer/doc//standalone/<format>docbook
<dependency>../libs/lexical_cast/doc//lexical_cast
<dependency>../libs/chrono/doc//chrono
+ <dependency>../../libs/dll/doc//dll-doc
<dependency>../libs/program_options/doc//autodoc.xml
<dependency>../libs/algorithm/string/doc//autodoc.xml
<dependency>../libs/logic/doc//reference.xml
@@ -92,6 +93,8 @@ boostbook doc
<implicit-dependency>../libs/accumulators/doc//accumulators
<implicit-dependency>../libs/chrono/doc//chrono
<implicit-dependency>../libs/lexical_cast/doc//lexical_cast
+ <implicit-dependency>../libs/crc/doc//crc
+ <implicit-dependency>../../libs/dll/doc//dll-doc
<implicit-dependency>../libs/functional/hash/doc//hash
#<implicit-dependency>../libs/type_traits/doc//type_traits
<implicit-dependency>../libs/static_assert/doc//static_assert
diff --git a/doc/pdf/Jamfile.v2 b/doc/pdf/Jamfile.v2
index d79c177dd5..8bdf59293e 100644
--- a/doc/pdf/Jamfile.v2
+++ b/doc/pdf/Jamfile.v2
@@ -47,7 +47,8 @@ install pdf-install
../../libs/config/doc//standalone
../../libs/context/doc//context
../../libs/core/doc//standalone
- ../../libs/date_time/xmldoc//date_time
+ ../../libs/date_time/xmldoc//date_time
+ ../../libs/dll/doc//dll-doc
../../libs/foreach/doc//standalone
../../libs/function/doc//function-doc
# ../../libs/functional/overloaded_function/doc//doc
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 9474ac1362..fb214ec0bf 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -46,6 +46,7 @@
<xi:include href="circular_buffer.auto_index.docbook"/>
<xi:include href="container.auto_index.docbook"/>
<xi:include href="../../libs/date_time/xmldoc/date_time.xml"/>
+ <xi:include href="dll.xml"/>
<xi:include href="foreach.xml"/>
<xi:include href="../../libs/function/doc/function.xml"/>
<xi:include href="hash.xml"/>