<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12284">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Max: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move source code to src subdir<br><br>Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe<br>---<br>M Makefile.am<br>M configure.ac<br>A src/Makefile.am<br>R src/osmo-ctrl-client.c<br>R src/osysmon.h<br>R src/osysmon_ctrl.c<br>R src/osysmon_file.c<br>R src/osysmon_main.c<br>R src/osysmon_rtnl.c<br>R src/osysmon_sysinfo.c<br>R src/simple_ctrl.c<br>R src/simple_ctrl.h<br>R src/value_node.c<br>R src/value_node.h<br>14 files changed, 56 insertions(+), 56 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index cdf67bf..a838715 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -1,58 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = doc</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = doc src</span><br><span> </span><br><span> ACLOCAL_AMFLAGS = -I m4</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CPPFLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(all_includes) \</span><br><span style="color: hsl(0, 100%, 40%);">- -I$(top_srcdir) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- -Wall \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOVTY_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBMNL_CFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-AM_LDFLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(COVERAGE_LDFLAGS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-sysmon \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-ctrl-client \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_sysmon_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBMNL_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_sysmon_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- value_node.c \</span><br><span style="color: hsl(0, 100%, 40%);">- simple_ctrl.c \</span><br><span style="color: hsl(0, 100%, 40%);">- osysmon_ctrl.c \</span><br><span style="color: hsl(0, 100%, 40%);">- osysmon_sysinfo.c \</span><br><span style="color: hsl(0, 100%, 40%);">- osysmon_rtnl.c \</span><br><span style="color: hsl(0, 100%, 40%);">- osysmon_file.c \</span><br><span style="color: hsl(0, 100%, 40%);">- osysmon_main.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_ctrl_client_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_ctrl_client_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- simple_ctrl.c \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-ctrl-client.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = \</span><br><span style="color: hsl(0, 100%, 40%);">- osysmon.h \</span><br><span style="color: hsl(0, 100%, 40%);">- simple_ctrl.h \</span><br><span style="color: hsl(0, 100%, 40%);">- value_node.h \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 13082b7..734ac99 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -129,4 +129,5 @@</span><br><span> AC_OUTPUT(</span><br><span> doc/Makefile</span><br><span> doc/examples/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ src/Makefile</span><br><span> Makefile)</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..9ad5947</span><br><span>--- /dev/null</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -0,0 +1,54 @@</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(all_includes) \</span><br><span style="color: hsl(120, 100%, 40%);">+ -I$(top_srcdir) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ -Wall \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCORE_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBMNL_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AM_LDFLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(COVERAGE_LDFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-sysmon \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-ctrl-client \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_sysmon_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBMNL_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_sysmon_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ simple_ctrl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osysmon_ctrl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osysmon_sysinfo.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osysmon_rtnl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osysmon_file.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osysmon_main.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_ctrl_client_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_ctrl_client_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+ simple_ctrl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-ctrl-client.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ osysmon.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ simple_ctrl.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ value_node.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span>diff --git a/osmo-ctrl-client.c b/src/osmo-ctrl-client.c</span><br><span>similarity index 100%</span><br><span>rename from osmo-ctrl-client.c</span><br><span>rename to src/osmo-ctrl-client.c</span><br><span>diff --git a/osysmon.h b/src/osysmon.h</span><br><span>similarity index 100%</span><br><span>rename from osysmon.h</span><br><span>rename to src/osysmon.h</span><br><span>diff --git a/osysmon_ctrl.c b/src/osysmon_ctrl.c</span><br><span>similarity index 100%</span><br><span>rename from osysmon_ctrl.c</span><br><span>rename to src/osysmon_ctrl.c</span><br><span>diff --git a/osysmon_file.c b/src/osysmon_file.c</span><br><span>similarity index 100%</span><br><span>rename from osysmon_file.c</span><br><span>rename to src/osysmon_file.c</span><br><span>diff --git a/osysmon_main.c b/src/osysmon_main.c</span><br><span>similarity index 100%</span><br><span>rename from osysmon_main.c</span><br><span>rename to src/osysmon_main.c</span><br><span>diff --git a/osysmon_rtnl.c b/src/osysmon_rtnl.c</span><br><span>similarity index 100%</span><br><span>rename from osysmon_rtnl.c</span><br><span>rename to src/osysmon_rtnl.c</span><br><span>diff --git a/osysmon_sysinfo.c b/src/osysmon_sysinfo.c</span><br><span>similarity index 100%</span><br><span>rename from osysmon_sysinfo.c</span><br><span>rename to src/osysmon_sysinfo.c</span><br><span>diff --git a/simple_ctrl.c b/src/simple_ctrl.c</span><br><span>similarity index 100%</span><br><span>rename from simple_ctrl.c</span><br><span>rename to src/simple_ctrl.c</span><br><span>diff --git a/simple_ctrl.h b/src/simple_ctrl.h</span><br><span>similarity index 100%</span><br><span>rename from simple_ctrl.h</span><br><span>rename to src/simple_ctrl.h</span><br><span>diff --git a/value_node.c b/src/value_node.c</span><br><span>similarity index 100%</span><br><span>rename from value_node.c</span><br><span>rename to src/value_node.c</span><br><span>diff --git a/value_node.h b/src/value_node.h</span><br><span>similarity index 100%</span><br><span>rename from value_node.h</span><br><span>rename to src/value_node.h</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12284">change 12284</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/12284"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe </div>
<div style="display:none"> Gerrit-Change-Number: 12284 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>