summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2018-11-14 10:47:01 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-11-27 18:46:32 +0100
commitb7237b139dde582f1cec084b616ea2e05175b747 (patch)
tree77fca1d3bb7fd9779d7804aaacaac9c2e0cbb2a0 /doc
parent2162f5d89ed20f20ece30a3f4662b34df95a0753 (diff)
build manuals moved here from osmo-gsm-manuals.git
Moved to doc/manuals/, with full commit history, in preceding merge commit. Now incorporate in the build system. Build with: $ autoreconf -fi $ ./configure --enable-manuals $ make Shared files from osmo-gsm-manuals.git are found automatically if - the repository is checked out in ../osmo-gsm-manuals; or - if it osmo-gsm-manuals was installed with "make install"; or - OSMO_GSM_MANUALS_DIR is set. Related: OS#3385 Change-Id: Ib5a22c2ea81fdde036bf9efb47d785a830b88c93
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am1
-rw-r--r--doc/manuals/Makefile11
-rw-r--r--doc/manuals/Makefile.am17
-rw-r--r--doc/manuals/osmostp-usermanual.adoc28
-rw-r--r--doc/manuals/osmostp-vty-reference.xml2
5 files changed, 33 insertions, 26 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1d42b0a..2f30815 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,4 @@
SUBDIRS = \
examples \
+ manuals \
$(NULL)
diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile
deleted file mode 100644
index 6832dd4..0000000
--- a/doc/manuals/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TOPDIR = ..
-
-ASCIIDOC = osmostp-usermanual.adoc
-include $(TOPDIR)/build/Makefile.asciidoc.inc
-osmostp-usermanual.pdf: chapters/*.adoc
-aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc
-
-VTY_REFERENCE = osmostp-vty-reference.xml
-include $(TOPDIR)/build/Makefile.vty-reference.inc
-
-include $(TOPDIR)/build/Makefile.common.inc
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
new file mode 100644
index 0000000..ce5b128
--- /dev/null
+++ b/doc/manuals/Makefile.am
@@ -0,0 +1,17 @@
+EXTRA_DIST = osmostp-usermanual.adoc \
+ osmostp-usermanual-docinfo.xml \
+ osmostp-vty-reference.xml \
+ chapters \
+ vty
+
+if BUILD_MANUALS
+ ASCIIDOC = osmostp-usermanual.adoc
+ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
+ osmostp-usermanual.pdf: $(srcdir)/chapters/*.adoc
+ aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc
+
+ VTY_REFERENCE = osmostp-vty-reference.xml
+ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
+
+ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
+endif
diff --git a/doc/manuals/osmostp-usermanual.adoc b/doc/manuals/osmostp-usermanual.adoc
index 6dc1d08..9f41e5d 100644
--- a/doc/manuals/osmostp-usermanual.adoc
+++ b/doc/manuals/osmostp-usermanual.adoc
@@ -3,32 +3,32 @@ OsmoSTP User Manual
Harald Welte <hwelte@sysmocom.de>
-include::../common/chapters/preface.adoc[]
+include::./common/chapters/preface.adoc[]
-// include::chapters/overview.adoc[]
+// include::{srcdir}/chapters/overview.adoc[]
-include::../common/chapters/sigtran.adoc[]
+include::./common/chapters/sigtran.adoc[]
-include::../common/chapters/sigtran-osmocom.adoc[]
+include::./common/chapters/sigtran-osmocom.adoc[]
-//include::chapters/running.adoc[]
-// include::chapters/control.adoc[]
+//include::{srcdir}/chapters/running.adoc[]
+// include::{srcdir}/chapters/control.adoc[]
-include::../common/chapters/vty.adoc[]
+include::./common/chapters/vty.adoc[]
-include::../common/chapters/logging.adoc[]
+include::./common/chapters/logging.adoc[]
-//include::../common/chapters/bts.adoc[]
+//include::./common/chapters/bts.adoc[]
//include::../OsmoNITB/chapters/bts-examples.adoc[]
-//include::../common/chapters/control_if.adoc[]
+//include::./common/chapters/control_if.adoc[]
-include::../common/chapters/port_numbers.adoc[]
+include::./common/chapters/port_numbers.adoc[]
-include::../common/chapters/bibliography.adoc[]
+include::./common/chapters/bibliography.adoc[]
-include::../common/chapters/glossary.adoc[]
+include::./common/chapters/glossary.adoc[]
-include::../common/chapters/gfdl.adoc[]
+include::./common/chapters/gfdl.adoc[]
diff --git a/doc/manuals/osmostp-vty-reference.xml b/doc/manuals/osmostp-vty-reference.xml
index b4ee500..ae0f7b0 100644
--- a/doc/manuals/osmostp-vty-reference.xml
+++ b/doc/manuals/osmostp-vty-reference.xml
@@ -5,7 +5,7 @@
-->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
"http://docbook.org/xml/5.0/dtd/docbook.dtd" [
-<!ENTITY chapter-vty SYSTEM "../common/chapters/vty.xml" >
+<!ENTITY chapter-vty SYSTEM "./common/chapters/vty.xml" >
<!ENTITY sections-vty SYSTEM "generated/docbook_vty.xml" >
]>