<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11725">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Neels Hofmeyr: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use autotools to add "make install" target<br><br>For reasoning why a transition to autotools is desired, see the commit<br>message of the previous patch in this series.<br><br>"make install" copies the "build", "common" dirs, as well as the "*.xsl"<br>files to $(prefix)/share/osmo-gsm-manuals. Prefix is typically<br>/usr/local. Also a pkg-config file gets installed, so the path of the<br>shared files can be looked up by autoconf scripts of the project<br>repositories. The check-depends script is installed to<br>$(prefix)/bin/osmo-gsm-manuals-check-depends and will be used by<br>project specific autoconf scripts, too.<br><br>All existing make targets ("make", "make check", "make upload") are<br>still working, users only need to run "autoreconf -fi" and<br>"./configure" beforehand.<br><br>Makefile.am uses custom install-data-hook and uninstall-local targets,<br>so we don't need to specify each file of the relevant subdirs in a<br>_DATA variable (no extra maintenance effort).<br><br>(moving manuals to project repositories 5/19)<br><br>Related: OS#3385<br>Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7<br>---<br>M .gitignore<br>M INSTALL.txt<br>D Makefile<br>A Makefile.am<br>R OsmoBSC/Makefile.am<br>R OsmoBTS/Makefile.am<br>R OsmoGGSN/Makefile.am<br>R OsmoGSMTester/Makefile.am<br>R OsmoHLR/Makefile.am<br>R OsmoMGCP/Makefile.am<br>R OsmoMGW/Makefile.am<br>R OsmoMSC/Makefile.am<br>R OsmoNAT/Makefile.am<br>R OsmoNITB/Makefile.am<br>R OsmoPCU/Makefile.am<br>R OsmoSGSN/Makefile.am<br>R OsmoSIPConnector/Makefile.am<br>R OsmoSTP/Makefile.am<br>R OsmoTRX/Makefile.am<br>R OsmocomBB/Makefile.am<br>M build/Makefile.common.inc<br>A configure.ac<br>M contrib/jenkins.sh<br>A osmo-gsm-manuals.pc.in<br>R tests/Makefile.am<br>25 files changed, 131 insertions(+), 79 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index fbe2111..30bc93e 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -14,3 +14,23 @@</span><br><span> # git-version-gen</span><br><span> .tarball-version</span><br><span> .version</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# autotools</span><br><span style="color: hsl(120, 100%, 40%);">+aclocal.m4</span><br><span style="color: hsl(120, 100%, 40%);">+autom4te.cache/</span><br><span style="color: hsl(120, 100%, 40%);">+config.log</span><br><span style="color: hsl(120, 100%, 40%);">+config.status</span><br><span style="color: hsl(120, 100%, 40%);">+config.guess</span><br><span style="color: hsl(120, 100%, 40%);">+config.sub</span><br><span style="color: hsl(120, 100%, 40%);">+configure</span><br><span style="color: hsl(120, 100%, 40%);">+compile</span><br><span style="color: hsl(120, 100%, 40%);">+depcomp</span><br><span style="color: hsl(120, 100%, 40%);">+install-sh</span><br><span style="color: hsl(120, 100%, 40%);">+missing</span><br><span style="color: hsl(120, 100%, 40%);">+stamp-h1</span><br><span style="color: hsl(120, 100%, 40%);">+libtool</span><br><span style="color: hsl(120, 100%, 40%);">+ltmain.sh</span><br><span style="color: hsl(120, 100%, 40%);">+m4/*.m4</span><br><span style="color: hsl(120, 100%, 40%);">+*.pc</span><br><span style="color: hsl(120, 100%, 40%);">+Makefile.in</span><br><span style="color: hsl(120, 100%, 40%);">+Makefile</span><br><span>diff --git a/INSTALL.txt b/INSTALL.txt</span><br><span>index 9c3ee7b..6efe8d1 100644</span><br><span>--- a/INSTALL.txt</span><br><span>+++ b/INSTALL.txt</span><br><span>@@ -15,8 +15,11 @@</span><br><span> (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.)</span><br><span> </span><br><span> Build PDFs, run:</span><br><span style="color: hsl(120, 100%, 40%);">+ autoreconf -fi</span><br><span style="color: hsl(120, 100%, 40%);">+ ./configure</span><br><span> make</span><br><span style="color: hsl(0, 100%, 40%);">-or for a parallel build using more CPU cores:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+or for a parallel build using more CPU cores, replace make with:</span><br><span> make -j 5</span><br><span> </span><br><span> To update the VTY reference for a given program, use 'osmo_interact_vty.py -X',</span><br><span>diff --git a/Makefile b/Makefile</span><br><span>deleted file mode 100644</span><br><span>index c94f0a8..0000000</span><br><span>--- a/Makefile</span><br><span>+++ /dev/null</span><br><span>@@ -1,78 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-all: check-deps</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBTS; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNITB; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBSC; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMGCP; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSGSN; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGGSN; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNAT; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoPCU; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGSMTester; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMSC; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoHLR; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSIPConnector; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSTP; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmocomBB; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMGW; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoTRX; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-clean:</span><br><span style="color: hsl(0, 100%, 40%);">- cd tests; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBTS; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNITB; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBSC; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMGCP; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSGSN; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGGSN; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNAT; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoPCU; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGSMTester; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMSC; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoHLR; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSIPConnector; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSTP; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmocomBB; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMGW; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoTRX; $(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-upload:</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBTS; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNITB; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBSC; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMGCP; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSGSN; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGGSN; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNAT; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoPCU; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGSMTester; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMSC; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoHLR; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSIPConnector; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSTP; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmocomBB; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMGW; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoTRX; $(MAKE) upload</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-check:</span><br><span style="color: hsl(0, 100%, 40%);">- cd tests; $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBTS; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoNITB; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoBSC; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSGSN; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGGSN; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoPCU; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSTP; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- # These don't use asciidoc, so they have no 'make check' target:</span><br><span style="color: hsl(0, 100%, 40%);">- #cd OsmoMGCP; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- #cd OsmoNAT; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- #cd OsmoMGW; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoGSMTester; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoMSC; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoHLR; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSIPConnector; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoSTP; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmocomBB; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">- cd OsmoTRX; $(MAKE) check</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-check-deps:</span><br><span style="color: hsl(0, 100%, 40%);">- ./check-depends.sh</span><br><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..dc8f1ca</span><br><span>--- /dev/null</span><br><span>+++ b/Makefile.am</span><br><span>@@ -0,0 +1,51 @@</span><br><span style="color: hsl(120, 100%, 40%);">+share_files = $(srcdir)/build $(srcdir)/common $(srcdir)/*.xsl</span><br><span style="color: hsl(120, 100%, 40%);">+share_path = "$(DESTDIR)$(prefix)/share/osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+pkgconfigdir = $(libdir)/pkgconfig</span><br><span style="color: hsl(120, 100%, 40%);">+pkgconfig_DATA = osmo-gsm-manuals.pc</span><br><span style="color: hsl(120, 100%, 40%);">+BUILT_SOURCES = $(top_srcdir)/.version</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files)</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = tests \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoBSC \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoBTS \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoGGSN \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoGSMTester \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoHLR \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoMGCP \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoMGW \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoMSC \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoNAT \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoNITB \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoPCU \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoSGSN \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoSIPConnector \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoSTP \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoTRX \</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmocomBB</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+$(top_srcdir)/.version:</span><br><span style="color: hsl(120, 100%, 40%);">+ echo $(VERSION) > $@-t && mv $@-t $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dist-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+ echo $(VERSION) > $(distdir)/.tarball-version</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+install-data-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+ cd "$(srcdir)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ files="$$(find $(notdir $(share_files)) -not -type d)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in $$files; do \</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -x "$$i" ]; then \</span><br><span style="color: hsl(120, 100%, 40%);">+ mode=755; \</span><br><span style="color: hsl(120, 100%, 40%);">+ else \</span><br><span style="color: hsl(120, 100%, 40%);">+ mode=644; \</span><br><span style="color: hsl(120, 100%, 40%);">+ fi; \</span><br><span style="color: hsl(120, 100%, 40%);">+ install -vDm$$mode "$$i" "$(share_path)/$$i" || exit 1; \</span><br><span style="color: hsl(120, 100%, 40%);">+ done;</span><br><span style="color: hsl(120, 100%, 40%);">+ install -Dm755 "$(srcdir)/check-depends.sh" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uninstall-local:</span><br><span style="color: hsl(120, 100%, 40%);">+ rm -rv "$(share_path)" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+upload:</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in Osmo*; do \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(MAKE) -C "$$i" upload || exit 1; \</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span>diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoBSC/Makefile</span><br><span>rename to OsmoBSC/Makefile.am</span><br><span>diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoBTS/Makefile</span><br><span>rename to OsmoBTS/Makefile.am</span><br><span>diff --git a/OsmoGGSN/Makefile b/OsmoGGSN/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoGGSN/Makefile</span><br><span>rename to OsmoGGSN/Makefile.am</span><br><span>diff --git a/OsmoGSMTester/Makefile b/OsmoGSMTester/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoGSMTester/Makefile</span><br><span>rename to OsmoGSMTester/Makefile.am</span><br><span>diff --git a/OsmoHLR/Makefile b/OsmoHLR/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoHLR/Makefile</span><br><span>rename to OsmoHLR/Makefile.am</span><br><span>diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoMGCP/Makefile</span><br><span>rename to OsmoMGCP/Makefile.am</span><br><span>diff --git a/OsmoMGW/Makefile b/OsmoMGW/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoMGW/Makefile</span><br><span>rename to OsmoMGW/Makefile.am</span><br><span>diff --git a/OsmoMSC/Makefile b/OsmoMSC/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoMSC/Makefile</span><br><span>rename to OsmoMSC/Makefile.am</span><br><span>diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoNAT/Makefile</span><br><span>rename to OsmoNAT/Makefile.am</span><br><span>diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoNITB/Makefile</span><br><span>rename to OsmoNITB/Makefile.am</span><br><span>diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoPCU/Makefile</span><br><span>rename to OsmoPCU/Makefile.am</span><br><span>diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoSGSN/Makefile</span><br><span>rename to OsmoSGSN/Makefile.am</span><br><span>diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoSIPConnector/Makefile</span><br><span>rename to OsmoSIPConnector/Makefile.am</span><br><span>diff --git a/OsmoSTP/Makefile b/OsmoSTP/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoSTP/Makefile</span><br><span>rename to OsmoSTP/Makefile.am</span><br><span>diff --git a/OsmoTRX/Makefile b/OsmoTRX/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmoTRX/Makefile</span><br><span>rename to OsmoTRX/Makefile.am</span><br><span>diff --git a/OsmocomBB/Makefile b/OsmocomBB/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from OsmocomBB/Makefile</span><br><span>rename to OsmocomBB/Makefile.am</span><br><span>diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc</span><br><span>index e624b5f..6a210bc 100644</span><br><span>--- a/build/Makefile.common.inc</span><br><span>+++ b/build/Makefile.common.inc</span><br><span>@@ -12,3 +12,5 @@</span><br><span> </span><br><span> clean:</span><br><span> -rm -rf $(CLEAN_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+distclean: clean</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>new file mode 100644</span><br><span>index 0000000..e890b3e</span><br><span>--- /dev/null</span><br><span>+++ b/configure.ac</span><br><span>@@ -0,0 +1,46 @@</span><br><span style="color: hsl(120, 100%, 40%);">+dnl Process this file with autoconf to produce a configure script</span><br><span style="color: hsl(120, 100%, 40%);">+AC_INIT([osmo-gsm-manuals],</span><br><span style="color: hsl(120, 100%, 40%);">+ m4_esyscmd([./git-version-gen .tarball-version]),</span><br><span style="color: hsl(120, 100%, 40%);">+ [openbsc@lists.osmocom.org])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dnl *This* is the root dir, even if an install-sh exists in ../ or ../../</span><br><span style="color: hsl(120, 100%, 40%);">+AC_CONFIG_AUX_DIR([.])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6 subdir-objects])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dnl checks for programs</span><br><span style="color: hsl(120, 100%, 40%);">+AC_PROG_INSTALL</span><br><span style="color: hsl(120, 100%, 40%);">+LT_INIT</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dnl check for pkg-config (explained in detail in libosmocore/configure.ac)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$PKG_CONFIG_INSTALLED" = "xno"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_WARN([You need to install pkg-config])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_PROG_PKG_CONFIG([0.20])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if ! $srcdir/check-depends.sh</span><br><span style="color: hsl(120, 100%, 40%);">+then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR("missing dependencies!")</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AC_OUTPUT(</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-gsm-manuals.pc</span><br><span style="color: hsl(120, 100%, 40%);">+ Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ tests/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoBSC/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoBTS/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoGGSN/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoGSMTester/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoHLR/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoMGCP/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoMGW/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoMSC/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoNAT/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoNITB/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoPCU/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoSGSN/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoSIPConnector/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoSTP/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmoTRX/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ OsmocomBB/Makefile)</span><br><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 80d873d..1fd19d1 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -6,6 +6,8 @@</span><br><span> </span><br><span> osmo-clean-workspace.sh</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+autoreconf -fi</span><br><span style="color: hsl(120, 100%, 40%);">+./configure</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span> $MAKE $PARALLEL_MAKE check</span><br><span> </span><br><span>diff --git a/osmo-gsm-manuals.pc.in b/osmo-gsm-manuals.pc.in</span><br><span>new file mode 100644</span><br><span>index 0000000..f9b318e</span><br><span>--- /dev/null</span><br><span>+++ b/osmo-gsm-manuals.pc.in</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+prefix=@prefix@</span><br><span style="color: hsl(120, 100%, 40%);">+osmogsmmanualsdir=@prefix@/share/osmo-gsm-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Name: Osmocom GSM Manuals Development Files</span><br><span style="color: hsl(120, 100%, 40%);">+Description: Common files for building manuals of Osmocom programs</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span>diff --git a/tests/Makefile b/tests/Makefile.am</span><br><span>similarity index 100%</span><br><span>rename from tests/Makefile</span><br><span>rename to tests/Makefile.am</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11725">change 11725</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11725"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-manuals </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 </div>
<div style="display:none"> Gerrit-Change-Number: 11725 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>