From 751f410a056725ea05294ee51e8f15fb0cdf4cb8 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 14 Nov 2018 10:47:01 +0100 Subject: 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: I4466d820cb3a5609a4a8534b1581684f891a04cd --- doc/manuals/Makefile | 10 --------- doc/manuals/Makefile.am | 15 +++++++++++++ doc/manuals/osmonitb-usermanual.adoc | 40 +++++++++++++++++----------------- doc/manuals/osmonitb-vty-reference.xml | 2 +- 4 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 doc/manuals/Makefile create mode 100644 doc/manuals/Makefile.am diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile deleted file mode 100644 index 0cd260d0e..000000000 --- a/doc/manuals/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -TOPDIR = .. - -ASCIIDOC = osmonitb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmonitb-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 000000000..3735c5be9 --- /dev/null +++ b/doc/manuals/Makefile.am @@ -0,0 +1,15 @@ +OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmonitb-usermanual.adoc \ + osmonitb-usermanual-docinfo.xml \ + osmonitb-vty-reference.xml \ + chapters \ + vty + +ASCIIDOC = osmonitb-usermanual.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmonitb-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/doc/manuals/osmonitb-usermanual.adoc b/doc/manuals/osmonitb-usermanual.adoc index 63d430a54..42afe89de 100644 --- a/doc/manuals/osmonitb-usermanual.adoc +++ b/doc/manuals/osmonitb-usermanual.adoc @@ -6,43 +6,43 @@ OsmoNITB User Manual Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.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::chapters/net.adoc[] +include::{srcdir}/chapters/net.adoc[] -include::../common/chapters/bsc.adoc[] +include::./common/chapters/bsc.adoc[] -include::../common/chapters/bts.adoc[] +include::./common/chapters/bts.adoc[] -include::chapters/bts-examples.adoc[] +include::{srcdir}/chapters/bts-examples.adoc[] -include::chapters/hlr.adoc[] +include::{srcdir}/chapters/hlr.adoc[] -include::../common/chapters/smpp.adoc[] +include::./common/chapters/smpp.adoc[] -include::../common/chapters/mncc.adoc[] +include::./common/chapters/mncc.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/cell-broadcast.adoc[] +include::./common/chapters/cell-broadcast.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.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/osmonitb-vty-reference.xml b/doc/manuals/osmonitb-vty-reference.xml index 140716517..da0e358a2 100644 --- a/doc/manuals/osmonitb-vty-reference.xml +++ b/doc/manuals/osmonitb-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> -- cgit v1.2.3