summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2018-11-14 15:27:01 +0100
committerOliver Smith <osmith@sysmocom.de>2018-11-21 14:29:11 +0100
commite388d006f3fd38ee41a712144ebab15929f09dcf (patch)
treea3da3e82f63c44c49528587a07c8f34c0fc86c14
parent673e2dc48189e113d253738545b0430ab3a2d40c (diff)
Osmo*/Makefile.am: use $(srcdir), $(top_srcdir)
Use $(srcdir) infront of all relative paths, which reference other files in the repository. Use $(top_srcdir) as OSMO_GSM_MANUALS_DIR. This is needed for out-of-tree building. (moving manuals to project repositories 11/19) Related: OS#3385 Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc
-rw-r--r--OsmoBSC/Makefile.am6
-rw-r--r--OsmoBTS/Makefile.am8
-rw-r--r--OsmoGGSN/Makefile.am4
-rw-r--r--OsmoGSMTester/Makefile.am4
-rw-r--r--OsmoHLR/Makefile.am4
-rw-r--r--OsmoMGCP/Makefile.am2
-rw-r--r--OsmoMGW/Makefile.am4
-rw-r--r--OsmoMSC/Makefile.am4
-rw-r--r--OsmoNAT/Makefile.am2
-rw-r--r--OsmoNITB/Makefile.am4
-rw-r--r--OsmoPCU/Makefile.am6
-rw-r--r--OsmoSGSN/Makefile.am4
-rw-r--r--OsmoSIPConnector/Makefile.am4
-rw-r--r--OsmoSTP/Makefile.am6
-rw-r--r--OsmoTRX/Makefile.am4
-rw-r--r--OsmocomBB/Makefile.am4
-rw-r--r--build/Makefile.asciidoc.inc2
-rw-r--r--build/Makefile.docbook.inc2
-rw-r--r--tests/Makefile.am2
19 files changed, 38 insertions, 38 deletions
diff --git a/OsmoBSC/Makefile.am b/OsmoBSC/Makefile.am
index 422c598..3e71048 100644
--- a/OsmoBSC/Makefile.am
+++ b/OsmoBSC/Makefile.am
@@ -1,9 +1,9 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot
-aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc
+osmobsc-usermanual.pdf: $(srcdir)/chapters/*.adoc $(srcdir)/chapters/*.dot
+aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc
VTY_REFERENCE = osmobsc-vty-reference.xml
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
diff --git a/OsmoBTS/Makefile.am b/OsmoBTS/Makefile.am
index 536ed17..c97cb3a 100644
--- a/OsmoBTS/Makefile.am
+++ b/OsmoBTS/Makefile.am
@@ -1,10 +1,10 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-osmobts-usermanual.pdf: chapters/*.adoc
-osmobts-abis.pdf: abis/*.adoc abis/*.msc
-rtp-amr.pdf: dtx.dot
+osmobts-usermanual.pdf: $(srcdir)/chapters/*.adoc
+osmobts-abis.pdf: $(srcdir)/abis/*.adoc $(srcdir)/abis/*.msc
+rtp-amr.pdf: $(srcdir)/dtx.dot
VTY_REFERENCE = osmobts-vty-reference.xml
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am
index dce2b02..ec1e8db 100644
--- a/OsmoGGSN/Makefile.am
+++ b/OsmoGGSN/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmoggsn-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmoggsn-vty-reference.xml
diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am
index 4fe6748..6bba962 100644
--- a/OsmoGSMTester/Makefile.am
+++ b/OsmoGSMTester/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmo-gsm-tester-manual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am
index 321c2a1..45d534a 100644
--- a/OsmoHLR/Makefile.am
+++ b/OsmoHLR/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmohlr-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmohlr-vty-reference.xml
diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am
index d47f390..8650693 100644
--- a/OsmoMGCP/Makefile.am
+++ b/OsmoMGCP/Makefile.am
@@ -1,4 +1,4 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
VTY_REFERENCE = osmomgcp-vty-reference.xml
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am
index 96b436b..a00722b 100644
--- a/OsmoMGW/Makefile.am
+++ b/OsmoMGW/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmomgw-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmomgw-vty-reference.xml
diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am
index 2548852..fe9a8c0 100644
--- a/OsmoMSC/Makefile.am
+++ b/OsmoMSC/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmomsc-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmomsc-vty-reference.xml
diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am
index 8d7c4a5..64b18e2 100644
--- a/OsmoNAT/Makefile.am
+++ b/OsmoNAT/Makefile.am
@@ -1,4 +1,4 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
VTY_REFERENCE = osmonat-vty-reference.xml
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
diff --git a/OsmoNITB/Makefile.am b/OsmoNITB/Makefile.am
index 4b275dd..11ec5b1 100644
--- a/OsmoNITB/Makefile.am
+++ b/OsmoNITB/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmonitb-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmonitb-vty-reference.xml
diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am
index 0f0ae76..9830701 100644
--- a/OsmoPCU/Makefile.am
+++ b/OsmoPCU/Makefile.am
@@ -1,9 +1,9 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-osmopcu-gb.pdf: gb/*.adoc gb/*.msc
-osmopcu-usermanual.pdf: chapters/*.adoc
+osmopcu-gb.pdf: $(srcdir)/gb/*.adoc $(srcdir)/gb/*.msc
+osmopcu-usermanual.pdf: $(srcdir)/chapters/*.adoc
VTY_REFERENCE = osmopcu-vty-reference.xml
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am
index ce69960..b2ab73b 100644
--- a/OsmoSGSN/Makefile.am
+++ b/OsmoSGSN/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmosgsn-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmosgsn-vty-reference.xml
diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am
index e275e41..36f3452 100644
--- a/OsmoSIPConnector/Makefile.am
+++ b/OsmoSIPConnector/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmosipconnector-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmosipconnector-vty-reference.xml
diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am
index 10149bf..2eefccd 100644
--- a/OsmoSTP/Makefile.am
+++ b/OsmoSTP/Makefile.am
@@ -1,9 +1,9 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmostp-usermanual.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-osmostp-usermanual.pdf: chapters/*.adoc
-aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc
+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
diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am
index 3b4b8b1..ed8287a 100644
--- a/OsmoTRX/Makefile.am
+++ b/OsmoTRX/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmotrx-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
VTY_REFERENCE = osmotrx-vty-reference.xml
diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am
index a0b7a2a..f5ed510 100644
--- a/OsmocomBB/Makefile.am
+++ b/OsmocomBB/Makefile.am
@@ -1,7 +1,7 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
ASCIIDOC = osmocombb-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc
index 6b57c7d..cff47f6 100644
--- a/build/Makefile.asciidoc.inc
+++ b/build/Makefile.asciidoc.inc
@@ -12,7 +12,7 @@
#
# OSMO_GSM_MANUALS_DIR = ..
# ASCIIDOC = osmo_yada.adoc osmo_moo.adoc
-# ASCIIDOC_DEPS = for_all/*.adoc
+# ASCIIDOC_DEPS = $(srcdir)/for_all/*.adoc
# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
# osmo_yada.pdf: yada/*.adoc yada/*.msc
diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc
index 4d015a7..7b9969a 100644
--- a/build/Makefile.docbook.inc
+++ b/build/Makefile.docbook.inc
@@ -12,7 +12,7 @@
#
# OSMO_GSM_MANUALS_DIR = ..
# DOCBOOKS = osmo_yada.xml osmo_moo.xml
-# ASCIIDOC_DEPS = for_all/*.xml
+# ASCIIDOC_DEPS = $(srcdir)/for_all/*.xml
# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc
# osmo_yada.pdf: yada/*.xml
#
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5afc8ca..3d03edd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-OSMO_GSM_MANUALS_DIR = ..
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
# Generate adoc file that includes all chapters
ASCIIDOC = test-usermanual.adoc