From 2768f95086e65974d036698a85ec906eb6a416c8 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 12 Dec 2018 19:19:14 +0100 Subject: [PATCH] Move source code to src subdir Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe --- Makefile.am | 57 +------------------- configure.ac | 1 + src/Makefile.am | 54 +++++++++++++++++++ osmo-ctrl-client.c => src/osmo-ctrl-client.c | 0 osysmon.h => src/osysmon.h | 0 osysmon_ctrl.c => src/osysmon_ctrl.c | 0 osysmon_file.c => src/osysmon_file.c | 0 osysmon_main.c => src/osysmon_main.c | 0 osysmon_rtnl.c => src/osysmon_rtnl.c | 0 osysmon_sysinfo.c => src/osysmon_sysinfo.c | 0 simple_ctrl.c => src/simple_ctrl.c | 0 simple_ctrl.h => src/simple_ctrl.h | 0 value_node.c => src/value_node.c | 0 value_node.h => src/value_node.h | 0 14 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 src/Makefile.am rename osmo-ctrl-client.c => src/osmo-ctrl-client.c (100%) rename osysmon.h => src/osysmon.h (100%) rename osysmon_ctrl.c => src/osysmon_ctrl.c (100%) rename osysmon_file.c => src/osysmon_file.c (100%) rename osysmon_main.c => src/osysmon_main.c (100%) rename osysmon_rtnl.c => src/osysmon_rtnl.c (100%) rename osysmon_sysinfo.c => src/osysmon_sysinfo.c (100%) rename simple_ctrl.c => src/simple_ctrl.c (100%) rename simple_ctrl.h => src/simple_ctrl.h (100%) rename value_node.c => src/value_node.c (100%) rename value_node.h => src/value_node.h (100%) diff --git a/Makefile.am b/Makefile.am index cdf67bf..a838715 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,58 +1,3 @@ -SUBDIRS = doc +SUBDIRS = doc src ACLOCAL_AMFLAGS = -I m4 - -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBMNL_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -bin_PROGRAMS = \ - osmo-sysmon \ - osmo-ctrl-client \ - $(NULL) - -osmo_sysmon_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBMNL_LIBS) \ - $(NULL) - -osmo_sysmon_SOURCES = \ - value_node.c \ - simple_ctrl.c \ - osysmon_ctrl.c \ - osysmon_sysinfo.c \ - osysmon_rtnl.c \ - osysmon_file.c \ - osysmon_main.c \ - $(NULL) - -osmo_ctrl_client_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -osmo_ctrl_client_SOURCES = \ - simple_ctrl.c \ - osmo-ctrl-client.c \ - $(NULL) - -noinst_HEADERS = \ - osysmon.h \ - simple_ctrl.h \ - value_node.h \ - $(NULL) diff --git a/configure.ac b/configure.ac index 13082b7..734ac99 100644 --- a/configure.ac +++ b/configure.ac @@ -129,4 +129,5 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT( doc/Makefile doc/examples/Makefile + src/Makefile Makefile) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..9ad5947 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,54 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBMNL_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-sysmon \ + osmo-ctrl-client \ + $(NULL) + +osmo_sysmon_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBMNL_LIBS) \ + $(NULL) + +osmo_sysmon_SOURCES = \ + value_node.c \ + simple_ctrl.c \ + osysmon_ctrl.c \ + osysmon_sysinfo.c \ + osysmon_rtnl.c \ + osysmon_file.c \ + osysmon_main.c \ + $(NULL) + +osmo_ctrl_client_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +osmo_ctrl_client_SOURCES = \ + simple_ctrl.c \ + osmo-ctrl-client.c \ + $(NULL) + +noinst_HEADERS = \ + osysmon.h \ + simple_ctrl.h \ + value_node.h \ + $(NULL) diff --git a/osmo-ctrl-client.c b/src/osmo-ctrl-client.c similarity index 100% rename from osmo-ctrl-client.c rename to src/osmo-ctrl-client.c diff --git a/osysmon.h b/src/osysmon.h similarity index 100% rename from osysmon.h rename to src/osysmon.h diff --git a/osysmon_ctrl.c b/src/osysmon_ctrl.c similarity index 100% rename from osysmon_ctrl.c rename to src/osysmon_ctrl.c diff --git a/osysmon_file.c b/src/osysmon_file.c similarity index 100% rename from osysmon_file.c rename to src/osysmon_file.c diff --git a/osysmon_main.c b/src/osysmon_main.c similarity index 100% rename from osysmon_main.c rename to src/osysmon_main.c diff --git a/osysmon_rtnl.c b/src/osysmon_rtnl.c similarity index 100% rename from osysmon_rtnl.c rename to src/osysmon_rtnl.c diff --git a/osysmon_sysinfo.c b/src/osysmon_sysinfo.c similarity index 100% rename from osysmon_sysinfo.c rename to src/osysmon_sysinfo.c diff --git a/simple_ctrl.c b/src/simple_ctrl.c similarity index 100% rename from simple_ctrl.c rename to src/simple_ctrl.c diff --git a/simple_ctrl.h b/src/simple_ctrl.h similarity index 100% rename from simple_ctrl.h rename to src/simple_ctrl.h diff --git a/value_node.c b/src/value_node.c similarity index 100% rename from value_node.c rename to src/value_node.c diff --git a/value_node.h b/src/value_node.h similarity index 100% rename from value_node.h rename to src/value_node.h