From ac5e3e222a8ada3fa6e3a3253d4776310a58324d Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 12 Sep 2018 19:14:07 +0200 Subject: Move examples/ to doc/examples/ Change-Id: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe --- Makefile.am | 2 +- configure.ac | 3 ++- doc/Makefile.am | 1 + doc/examples/Makefile.am | 4 ++++ doc/examples/osmo-pcu.cfg | 6 ++++++ examples/Makefile.am | 4 ---- examples/osmo-pcu.cfg | 6 ------ osmoappdesc.py | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 doc/Makefile.am create mode 100644 doc/examples/Makefile.am create mode 100644 doc/examples/osmo-pcu.cfg delete mode 100644 examples/Makefile.am delete mode 100644 examples/osmo-pcu.cfg diff --git a/Makefile.am b/Makefile.am index 240e4ee2..723c9ed8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src examples tests contrib +SUBDIRS = include src doc tests contrib EXTRA_DIST = osmoappdesc.py README.md DISTCHECK_CONFIGURE_FLAGS = \ diff --git a/configure.ac b/configure.ac index 90394e12..b5774ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -182,7 +182,8 @@ AC_OUTPUT( osmo-pcu.pc include/Makefile src/Makefile - examples/Makefile + doc/Makefile + doc/examples/Makefile tests/Makefile contrib/Makefile contrib/systemd/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..aee2d7ba --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 00000000..15001494 --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,4 @@ +pcuconfdir = $(sysconfdir)/osmocom +pcuconf_DATA = osmo-pcu.cfg + +EXTRA_DIST = osmo-pcu.cfg diff --git a/doc/examples/osmo-pcu.cfg b/doc/examples/osmo-pcu.cfg new file mode 100644 index 00000000..b88e6e7b --- /dev/null +++ b/doc/examples/osmo-pcu.cfg @@ -0,0 +1,6 @@ +pcu + flow-control-interval 10 + cs 2 + alloc-algorithm dynamic + alpha 0 + gamma 0 diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 15001494..00000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -pcuconfdir = $(sysconfdir)/osmocom -pcuconf_DATA = osmo-pcu.cfg - -EXTRA_DIST = osmo-pcu.cfg diff --git a/examples/osmo-pcu.cfg b/examples/osmo-pcu.cfg deleted file mode 100644 index b88e6e7b..00000000 --- a/examples/osmo-pcu.cfg +++ /dev/null @@ -1,6 +0,0 @@ -pcu - flow-control-interval 10 - cs 2 - alloc-algorithm dynamic - alpha 0 - gamma 0 diff --git a/osmoappdesc.py b/osmoappdesc.py index b202dc69..b3938f55 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -15,12 +15,12 @@ # along with this program. If not, see . app_configs = { - "osmo-pcu": ["examples/osmo-pcu.cfg"] + "osmo-pcu": ["doc/examples/osmo-pcu.cfg"] } apps = [(4240, "src/osmo-pcu", "Osmo-PCU", "osmo-pcu"), ] -vty_command = ["src/osmo-pcu", "-c", "examples/osmo-pcu.cfg"] +vty_command = ["src/osmo-pcu", "-c", "doc/examples/osmo-pcu.cfg"] vty_app = apps[0] -- cgit v1.2.3