From 2947683c3ac2ac94fda43c21be491c6417321e2b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 14 Nov 2018 14:25:18 +0100 Subject: use autotools to add "make install" target For reasoning why a transition to autotools is desired, see the commit message of the previous patch in this series. "make install" copies the "build", "common" dirs, as well as the "*.xsl" files to $(prefix)/share/osmo-gsm-manuals. Prefix is typically /usr/local. Also a pkg-config file gets installed, so the path of the shared files can be looked up by autoconf scripts of the project repositories. The check-depends script is installed to $(prefix)/bin/osmo-gsm-manuals-check-depends and will be used by project specific autoconf scripts, too. All existing make targets ("make", "make check", "make upload") are still working, users only need to run "autoreconf -fi" and "./configure" beforehand. Makefile.am uses custom install-data-hook and uninstall-local targets, so we don't need to specify each file of the relevant subdirs in a _DATA variable (no extra maintenance effort). (moving manuals to project repositories 5/19) Related: OS#3385 Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 --- .gitignore | 20 ++++++++++++ INSTALL.txt | 5 ++- Makefile | 78 -------------------------------------------- Makefile.am | 51 +++++++++++++++++++++++++++++ OsmoBSC/Makefile | 11 ------- OsmoBSC/Makefile.am | 11 +++++++ OsmoBTS/Makefile | 12 ------- OsmoBTS/Makefile.am | 12 +++++++ OsmoGGSN/Makefile | 10 ------ OsmoGGSN/Makefile.am | 10 ++++++ OsmoGSMTester/Makefile | 7 ---- OsmoGSMTester/Makefile.am | 7 ++++ OsmoHLR/Makefile | 51 ----------------------------- OsmoHLR/Makefile.am | 51 +++++++++++++++++++++++++++++ OsmoMGCP/Makefile | 6 ---- OsmoMGCP/Makefile.am | 6 ++++ OsmoMGW/Makefile | 10 ------ OsmoMGW/Makefile.am | 10 ++++++ OsmoMSC/Makefile | 10 ------ OsmoMSC/Makefile.am | 10 ++++++ OsmoNAT/Makefile | 6 ---- OsmoNAT/Makefile.am | 6 ++++ OsmoNITB/Makefile | 10 ------ OsmoNITB/Makefile.am | 10 ++++++ OsmoPCU/Makefile | 11 ------- OsmoPCU/Makefile.am | 11 +++++++ OsmoSGSN/Makefile | 10 ------ OsmoSGSN/Makefile.am | 10 ++++++ OsmoSIPConnector/Makefile | 10 ------ OsmoSIPConnector/Makefile.am | 10 ++++++ OsmoSTP/Makefile | 11 ------- OsmoSTP/Makefile.am | 11 +++++++ OsmoTRX/Makefile | 10 ------ OsmoTRX/Makefile.am | 10 ++++++ OsmocomBB/Makefile | 7 ---- OsmocomBB/Makefile.am | 7 ++++ build/Makefile.common.inc | 2 ++ configure.ac | 46 ++++++++++++++++++++++++++ contrib/jenkins.sh | 2 ++ osmo-gsm-manuals.pc.in | 6 ++++ tests/Makefile | 30 ----------------- tests/Makefile.am | 30 +++++++++++++++++ 42 files changed, 353 insertions(+), 301 deletions(-) delete mode 100644 Makefile create mode 100644 Makefile.am delete mode 100644 OsmoBSC/Makefile create mode 100644 OsmoBSC/Makefile.am delete mode 100644 OsmoBTS/Makefile create mode 100644 OsmoBTS/Makefile.am delete mode 100644 OsmoGGSN/Makefile create mode 100644 OsmoGGSN/Makefile.am delete mode 100644 OsmoGSMTester/Makefile create mode 100644 OsmoGSMTester/Makefile.am delete mode 100644 OsmoHLR/Makefile create mode 100644 OsmoHLR/Makefile.am delete mode 100644 OsmoMGCP/Makefile create mode 100644 OsmoMGCP/Makefile.am delete mode 100644 OsmoMGW/Makefile create mode 100644 OsmoMGW/Makefile.am delete mode 100644 OsmoMSC/Makefile create mode 100644 OsmoMSC/Makefile.am delete mode 100644 OsmoNAT/Makefile create mode 100644 OsmoNAT/Makefile.am delete mode 100644 OsmoNITB/Makefile create mode 100644 OsmoNITB/Makefile.am delete mode 100644 OsmoPCU/Makefile create mode 100644 OsmoPCU/Makefile.am delete mode 100644 OsmoSGSN/Makefile create mode 100644 OsmoSGSN/Makefile.am delete mode 100644 OsmoSIPConnector/Makefile create mode 100644 OsmoSIPConnector/Makefile.am delete mode 100644 OsmoSTP/Makefile create mode 100644 OsmoSTP/Makefile.am delete mode 100644 OsmoTRX/Makefile create mode 100644 OsmoTRX/Makefile.am delete mode 100644 OsmocomBB/Makefile create mode 100644 OsmocomBB/Makefile.am create mode 100644 configure.ac create mode 100644 osmo-gsm-manuals.pc.in delete mode 100644 tests/Makefile create mode 100644 tests/Makefile.am diff --git a/.gitignore b/.gitignore index fbe2111..30bc93e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,23 @@ tests/test-usermanual.adoc # git-version-gen .tarball-version .version + +# autotools +aclocal.m4 +autom4te.cache/ +config.log +config.status +config.guess +config.sub +configure +compile +depcomp +install-sh +missing +stamp-h1 +libtool +ltmain.sh +m4/*.m4 +*.pc +Makefile.in +Makefile diff --git a/INSTALL.txt b/INSTALL.txt index 9c3ee7b..6efe8d1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -15,8 +15,11 @@ apt-get install \ (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) Build PDFs, run: + autoreconf -fi + ./configure make -or for a parallel build using more CPU cores: + +or for a parallel build using more CPU cores, replace make with: make -j 5 To update the VTY reference for a given program, use 'osmo_interact_vty.py -X', diff --git a/Makefile b/Makefile deleted file mode 100644 index c94f0a8..0000000 --- a/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -all: check-deps - cd OsmoBTS; $(MAKE) - cd OsmoNITB; $(MAKE) - cd OsmoBSC; $(MAKE) - cd OsmoMGCP; $(MAKE) - cd OsmoSGSN; $(MAKE) - cd OsmoGGSN; $(MAKE) - cd OsmoNAT; $(MAKE) - cd OsmoPCU; $(MAKE) - cd OsmoGSMTester; $(MAKE) - cd OsmoMSC; $(MAKE) - cd OsmoHLR; $(MAKE) - cd OsmoSIPConnector; $(MAKE) - cd OsmoSTP; $(MAKE) - cd OsmocomBB; $(MAKE) - cd OsmoMGW; $(MAKE) - cd OsmoTRX; $(MAKE) - -clean: - cd tests; $(MAKE) clean - cd OsmoBTS; $(MAKE) clean - cd OsmoNITB; $(MAKE) clean - cd OsmoBSC; $(MAKE) clean - cd OsmoMGCP; $(MAKE) clean - cd OsmoSGSN; $(MAKE) clean - cd OsmoGGSN; $(MAKE) clean - cd OsmoNAT; $(MAKE) clean - cd OsmoPCU; $(MAKE) clean - cd OsmoGSMTester; $(MAKE) clean - cd OsmoMSC; $(MAKE) clean - cd OsmoHLR; $(MAKE) clean - cd OsmoSIPConnector; $(MAKE) clean - cd OsmoSTP; $(MAKE) clean - cd OsmocomBB; $(MAKE) clean - cd OsmoMGW; $(MAKE) clean - cd OsmoTRX; $(MAKE) clean - -upload: - cd OsmoBTS; $(MAKE) upload - cd OsmoNITB; $(MAKE) upload - cd OsmoBSC; $(MAKE) upload - cd OsmoMGCP; $(MAKE) upload - cd OsmoSGSN; $(MAKE) upload - cd OsmoGGSN; $(MAKE) upload - cd OsmoNAT; $(MAKE) upload - cd OsmoPCU; $(MAKE) upload - cd OsmoGSMTester; $(MAKE) upload - cd OsmoMSC; $(MAKE) upload - cd OsmoHLR; $(MAKE) upload - cd OsmoSIPConnector; $(MAKE) upload - cd OsmoSTP; $(MAKE) upload - cd OsmocomBB; $(MAKE) upload - cd OsmoMGW; $(MAKE) upload - cd OsmoTRX; $(MAKE) upload - -check: - cd tests; $(MAKE) - cd OsmoBTS; $(MAKE) check - cd OsmoNITB; $(MAKE) check - cd OsmoBSC; $(MAKE) check - cd OsmoSGSN; $(MAKE) check - cd OsmoGGSN; $(MAKE) check - cd OsmoPCU; $(MAKE) check - cd OsmoSTP; $(MAKE) check - # These don't use asciidoc, so they have no 'make check' target: - #cd OsmoMGCP; $(MAKE) check - #cd OsmoNAT; $(MAKE) check - #cd OsmoMGW; $(MAKE) check - cd OsmoGSMTester; $(MAKE) check - cd OsmoMSC; $(MAKE) check - cd OsmoHLR; $(MAKE) check - cd OsmoSIPConnector; $(MAKE) check - cd OsmoSTP; $(MAKE) check - cd OsmocomBB; $(MAKE) check - cd OsmoTRX; $(MAKE) check - -check-deps: - ./check-depends.sh diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..dc8f1ca --- /dev/null +++ b/Makefile.am @@ -0,0 +1,51 @@ +share_files = $(srcdir)/build $(srcdir)/common $(srcdir)/*.xsl +share_path = "$(DESTDIR)$(prefix)/share/osmo-gsm-manuals" + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = osmo-gsm-manuals.pc +BUILT_SOURCES = $(top_srcdir)/.version +EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) +SUBDIRS = tests \ + OsmoBSC \ + OsmoBTS \ + OsmoGGSN \ + OsmoGSMTester \ + OsmoHLR \ + OsmoMGCP \ + OsmoMGW \ + OsmoMSC \ + OsmoNAT \ + OsmoNITB \ + OsmoPCU \ + OsmoSGSN \ + OsmoSIPConnector \ + OsmoSTP \ + OsmoTRX \ + OsmocomBB + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ + +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + +install-data-hook: + cd "$(srcdir)" && \ + files="$$(find $(notdir $(share_files)) -not -type d)" && \ + for i in $$files; do \ + if [ -x "$$i" ]; then \ + mode=755; \ + else \ + mode=644; \ + fi; \ + install -vDm$$mode "$$i" "$(share_path)/$$i" || exit 1; \ + done; + install -Dm755 "$(srcdir)/check-depends.sh" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends" + +uninstall-local: + rm -rv "$(share_path)" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends" + +upload: + for i in Osmo*; do \ + $(MAKE) -C "$$i" upload || exit 1; \ + done diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile deleted file mode 100644 index 422c598..0000000 --- a/OsmoBSC/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -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 - -VTY_REFERENCE = osmobsc-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/OsmoBSC/Makefile.am b/OsmoBSC/Makefile.am new file mode 100644 index 0000000..422c598 --- /dev/null +++ b/OsmoBSC/Makefile.am @@ -0,0 +1,11 @@ +OSMO_GSM_MANUALS_DIR = .. + +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 + +VTY_REFERENCE = osmobsc-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/OsmoBTS/Makefile b/OsmoBTS/Makefile deleted file mode 100644 index 536ed17..0000000 --- a/OsmoBTS/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -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 - -VTY_REFERENCE = osmobts-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/OsmoBTS/Makefile.am b/OsmoBTS/Makefile.am new file mode 100644 index 0000000..536ed17 --- /dev/null +++ b/OsmoBTS/Makefile.am @@ -0,0 +1,12 @@ +OSMO_GSM_MANUALS_DIR = .. + +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 + +VTY_REFERENCE = osmobts-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/OsmoGGSN/Makefile b/OsmoGGSN/Makefile deleted file mode 100644 index dce2b02..0000000 --- a/OsmoGGSN/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmoggsn-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmoggsn-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/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am new file mode 100644 index 0000000..dce2b02 --- /dev/null +++ b/OsmoGGSN/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmoggsn-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmoggsn-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/OsmoGSMTester/Makefile b/OsmoGSMTester/Makefile deleted file mode 100644 index 4fe6748..0000000 --- a/OsmoGSMTester/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmo-gsm-tester-manual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am new file mode 100644 index 0000000..4fe6748 --- /dev/null +++ b/OsmoGSMTester/Makefile.am @@ -0,0 +1,7 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmo-gsm-tester-manual.adoc +ASCIIDOC_DEPS = 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 b/OsmoHLR/Makefile deleted file mode 100644 index 321c2a1..0000000 --- a/OsmoHLR/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmohlr-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmohlr-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc - -OSMO_HLR_PATH ?= ../../osmo-hlr -TMP_DB = generated/hlr.db - -update-examples: update-examples-ctrl update-examples-vty - -.PHONY: found-update-deps -found-update-deps: - @if [ ! -f "$(OSMO_HLR_PATH)/sql/hlr.sql" ]; then \ - echo "You need to define OSMO_HLR_PATH to point at an osmo-hlr.git"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo-hlr)" ]; then \ - echo "osmo-hlr needs to be installed / available in the PATH"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo_verify_transcript_ctrl.py)" ]; then \ - echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo_verify_transcript_vty.py)" ]; then \ - echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ - exit 1; \ - fi - -update-examples-ctrl: found-update-deps - mkdir -p generated - rm -f "$(TMP_DB)" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/tests/test_subscriber.sql" - osmo_verify_transcript_ctrl.py \ - -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ - -p 4259 --update *.ctrl - -update-examples-vty: found-update-deps - mkdir -p generated - rm -f "$(TMP_DB)" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" - osmo_verify_transcript_vty.py \ - -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ - -p 4258 --update *.vty diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am new file mode 100644 index 0000000..321c2a1 --- /dev/null +++ b/OsmoHLR/Makefile.am @@ -0,0 +1,51 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmohlr-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmohlr-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc + +OSMO_HLR_PATH ?= ../../osmo-hlr +TMP_DB = generated/hlr.db + +update-examples: update-examples-ctrl update-examples-vty + +.PHONY: found-update-deps +found-update-deps: + @if [ ! -f "$(OSMO_HLR_PATH)/sql/hlr.sql" ]; then \ + echo "You need to define OSMO_HLR_PATH to point at an osmo-hlr.git"; \ + exit 1; \ + fi + @if [ -z "$(shell which osmo-hlr)" ]; then \ + echo "osmo-hlr needs to be installed / available in the PATH"; \ + exit 1; \ + fi + @if [ -z "$(shell which osmo_verify_transcript_ctrl.py)" ]; then \ + echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ + exit 1; \ + fi + @if [ -z "$(shell which osmo_verify_transcript_vty.py)" ]; then \ + echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ + exit 1; \ + fi + +update-examples-ctrl: found-update-deps + mkdir -p generated + rm -f "$(TMP_DB)" + sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" + sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/tests/test_subscriber.sql" + osmo_verify_transcript_ctrl.py \ + -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ + -p 4259 --update *.ctrl + +update-examples-vty: found-update-deps + mkdir -p generated + rm -f "$(TMP_DB)" + sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" + osmo_verify_transcript_vty.py \ + -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ + -p 4258 --update *.vty diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile deleted file mode 100644 index d47f390..0000000 --- a/OsmoMGCP/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -VTY_REFERENCE = osmomgcp-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/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am new file mode 100644 index 0000000..d47f390 --- /dev/null +++ b/OsmoMGCP/Makefile.am @@ -0,0 +1,6 @@ +OSMO_GSM_MANUALS_DIR = .. + +VTY_REFERENCE = osmomgcp-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/OsmoMGW/Makefile b/OsmoMGW/Makefile deleted file mode 100644 index 96b436b..0000000 --- a/OsmoMGW/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmomgw-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmomgw-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/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am new file mode 100644 index 0000000..96b436b --- /dev/null +++ b/OsmoMGW/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmomgw-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmomgw-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/OsmoMSC/Makefile b/OsmoMSC/Makefile deleted file mode 100644 index 2548852..0000000 --- a/OsmoMSC/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmomsc-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmomsc-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/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am new file mode 100644 index 0000000..2548852 --- /dev/null +++ b/OsmoMSC/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmomsc-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmomsc-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/OsmoNAT/Makefile b/OsmoNAT/Makefile deleted file mode 100644 index 8d7c4a5..0000000 --- a/OsmoNAT/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -VTY_REFERENCE = osmonat-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/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am new file mode 100644 index 0000000..8d7c4a5 --- /dev/null +++ b/OsmoNAT/Makefile.am @@ -0,0 +1,6 @@ +OSMO_GSM_MANUALS_DIR = .. + +VTY_REFERENCE = osmonat-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/OsmoNITB/Makefile b/OsmoNITB/Makefile deleted file mode 100644 index 4b275dd..0000000 --- a/OsmoNITB/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmonitb-usermanual.adoc -ASCIIDOC_DEPS = 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/OsmoNITB/Makefile.am b/OsmoNITB/Makefile.am new file mode 100644 index 0000000..4b275dd --- /dev/null +++ b/OsmoNITB/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmonitb-usermanual.adoc +ASCIIDOC_DEPS = 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/OsmoPCU/Makefile b/OsmoPCU/Makefile deleted file mode 100644 index 0f0ae76..0000000 --- a/OsmoPCU/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -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 - -VTY_REFERENCE = osmopcu-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/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am new file mode 100644 index 0000000..0f0ae76 --- /dev/null +++ b/OsmoPCU/Makefile.am @@ -0,0 +1,11 @@ +OSMO_GSM_MANUALS_DIR = .. + +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 + +VTY_REFERENCE = osmopcu-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/OsmoSGSN/Makefile b/OsmoSGSN/Makefile deleted file mode 100644 index ce69960..0000000 --- a/OsmoSGSN/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmosgsn-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosgsn-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/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am new file mode 100644 index 0000000..ce69960 --- /dev/null +++ b/OsmoSGSN/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmosgsn-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmosgsn-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/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile deleted file mode 100644 index e275e41..0000000 --- a/OsmoSIPConnector/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmosipconnector-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosipconnector-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/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am new file mode 100644 index 0000000..e275e41 --- /dev/null +++ b/OsmoSIPConnector/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmosipconnector-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmosipconnector-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/OsmoSTP/Makefile b/OsmoSTP/Makefile deleted file mode 100644 index 10149bf..0000000 --- a/OsmoSTP/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -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 - -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 diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am new file mode 100644 index 0000000..10149bf --- /dev/null +++ b/OsmoSTP/Makefile.am @@ -0,0 +1,11 @@ +OSMO_GSM_MANUALS_DIR = .. + +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 + +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 diff --git a/OsmoTRX/Makefile b/OsmoTRX/Makefile deleted file mode 100644 index 3b4b8b1..0000000 --- a/OsmoTRX/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmotrx-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmotrx-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/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am new file mode 100644 index 0000000..3b4b8b1 --- /dev/null +++ b/OsmoTRX/Makefile.am @@ -0,0 +1,10 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmotrx-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = osmotrx-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/OsmocomBB/Makefile b/OsmocomBB/Makefile deleted file mode 100644 index a0b7a2a..0000000 --- a/OsmocomBB/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -ASCIIDOC = osmocombb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am new file mode 100644 index 0000000..a0b7a2a --- /dev/null +++ b/OsmocomBB/Makefile.am @@ -0,0 +1,7 @@ +OSMO_GSM_MANUALS_DIR = .. + +ASCIIDOC = osmocombb-usermanual.adoc +ASCIIDOC_DEPS = 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.common.inc b/build/Makefile.common.inc index e624b5f..6a210bc 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -12,3 +12,5 @@ upload: $(UPLOAD_FILES) clean: -rm -rf $(CLEAN_FILES) + +distclean: clean diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..e890b3e --- /dev/null +++ b/configure.ac @@ -0,0 +1,46 @@ +dnl Process this file with autoconf to produce a configure script +AC_INIT([osmo-gsm-manuals], + m4_esyscmd([./git-version-gen .tarball-version]), + [openbsc@lists.osmocom.org]) + +dnl *This* is the root dir, even if an install-sh exists in ../ or ../../ +AC_CONFIG_AUX_DIR([.]) + +AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6 subdir-objects]) + +dnl checks for programs +AC_PROG_INSTALL +LT_INIT + +dnl check for pkg-config (explained in detail in libosmocore/configure.ac) +AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) +if test "x$PKG_CONFIG_INSTALLED" = "xno"; then + AC_MSG_WARN([You need to install pkg-config]) +fi +PKG_PROG_PKG_CONFIG([0.20]) + +if ! $srcdir/check-depends.sh +then + AC_MSG_ERROR("missing dependencies!") +fi + +AC_OUTPUT( + osmo-gsm-manuals.pc + Makefile + tests/Makefile + OsmoBSC/Makefile + OsmoBTS/Makefile + OsmoGGSN/Makefile + OsmoGSMTester/Makefile + OsmoHLR/Makefile + OsmoMGCP/Makefile + OsmoMGW/Makefile + OsmoMSC/Makefile + OsmoNAT/Makefile + OsmoNITB/Makefile + OsmoPCU/Makefile + OsmoSGSN/Makefile + OsmoSIPConnector/Makefile + OsmoSTP/Makefile + OsmoTRX/Makefile + OsmocomBB/Makefile) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 80d873d..1fd19d1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -6,6 +6,8 @@ publish="$1" osmo-clean-workspace.sh +autoreconf -fi +./configure $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check diff --git a/osmo-gsm-manuals.pc.in b/osmo-gsm-manuals.pc.in new file mode 100644 index 0000000..f9b318e --- /dev/null +++ b/osmo-gsm-manuals.pc.in @@ -0,0 +1,6 @@ +prefix=@prefix@ +osmogsmmanualsdir=@prefix@/share/osmo-gsm-manuals + +Name: Osmocom GSM Manuals Development Files +Description: Common files for building manuals of Osmocom programs +Version: @VERSION@ diff --git a/tests/Makefile b/tests/Makefile deleted file mode 100644 index 5afc8ca..0000000 --- a/tests/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -OSMO_GSM_MANUALS_DIR = .. - -# Generate adoc file that includes all chapters -ASCIIDOC = test-usermanual.adoc -ASCIIDOC_DEPS = -$(ASCIIDOC): $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc - echo ":gfdl-enabled:" > $@ - echo ":program-name: Test" >> $@ - echo "" >> $@ - echo "Osmo GSM Manuals Shared Content Test" >> $@ - echo "====================================" >> $@ - echo "Oliver Smith " >> $@ - echo "" >> $@ - for chapter in $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc; do \ - echo "include::$${chapter}[]" >> $@; \ - done; -CLEAN_FILES = $(ASCIIDOC) - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = test-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc - - -default: all check - - -.DEFAULT_GOAL := default -.PHONY: default diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..5afc8ca --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,30 @@ +OSMO_GSM_MANUALS_DIR = .. + +# Generate adoc file that includes all chapters +ASCIIDOC = test-usermanual.adoc +ASCIIDOC_DEPS = +$(ASCIIDOC): $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc + echo ":gfdl-enabled:" > $@ + echo ":program-name: Test" >> $@ + echo "" >> $@ + echo "Osmo GSM Manuals Shared Content Test" >> $@ + echo "====================================" >> $@ + echo "Oliver Smith " >> $@ + echo "" >> $@ + for chapter in $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc; do \ + echo "include::$${chapter}[]" >> $@; \ + done; +CLEAN_FILES = $(ASCIIDOC) + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = test-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc + + +default: all check + + +.DEFAULT_GOAL := default +.PHONY: default -- cgit v1.2.3