From ac5e3e222a8ada3fa6e3a3253d4776310a58324d Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 12 Sep 2018 19:14:07 +0200 Subject: [PATCH] Move examples/ to doc/examples/ Change-Id: I1e163e10f8a2e22b9ebdcb2d0f13f6ad07c84efe --- Makefile.am | 2 +- configure.ac | 3 ++- doc/Makefile.am | 1 + {examples => doc/examples}/Makefile.am | 0 {examples => doc/examples}/osmo-pcu.cfg | 0 osmoappdesc.py | 4 ++-- 6 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 doc/Makefile.am rename {examples => doc/examples}/Makefile.am (100%) rename {examples => doc/examples}/osmo-pcu.cfg (100%) 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/examples/Makefile.am b/doc/examples/Makefile.am similarity index 100% rename from examples/Makefile.am rename to doc/examples/Makefile.am diff --git a/examples/osmo-pcu.cfg b/doc/examples/osmo-pcu.cfg similarity index 100% rename from examples/osmo-pcu.cfg rename to doc/examples/osmo-pcu.cfg 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]