Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12711 )
Change subject: Update Makefile.am ...................................................................... Update Makefile.am The simple_ctrl.c is used by 2 independent binaries. Let's build it as a convenience libtool library [1] to make it easier to add further external dependencies in future. While at it, also move osmo-sysmon dependencies to program-specific _CFLAGS from generic one. [1] https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 --- M .gitignore M src/Makefile.am 2 files changed, 8 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index c89e9b0..db2ef01 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ tests/testsuite.log writtenconfig/ +libintern.la diff --git a/src/Makefile.am b/src/Makefile.am index 412337b..cb85da2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +LDADD = libintern.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) AM_CPPFLAGS = \ $(all_includes) \ @@ -9,8 +9,6 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBMNL_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -22,6 +20,12 @@ osmo-ctrl-client \ $(NULL) +noinst_LTLIBRARIES = libintern.la +libintern_la_SOURCES = simple_ctrl.c +libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + +osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(AM_CFLAGS) + osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ $(LIBMNL_LIBS) \ @@ -29,7 +33,6 @@ osmo_sysmon_SOURCES = \ value_node.c \ - simple_ctrl.c \ osysmon_ctrl.c \ osysmon_sysinfo.c \ osysmon_rtnl.c \ @@ -37,11 +40,6 @@ osysmon_main.c \ $(NULL) -osmo_ctrl_client_SOURCES = \ - simple_ctrl.c \ - osmo-ctrl-client.c \ - $(NULL) - noinst_HEADERS = \ osysmon.h \ simple_ctrl.h \ -- To view, visit https://gerrit.osmocom.org/12711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfaba17b54983709278e1c24bf55edbbb4abd961 Gerrit-Change-Number: 12711 Gerrit-PatchSet: 5 Gerrit-Owner: Max <[email protected]> Gerrit-Reviewer: Harald Welte <[email protected]> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max <[email protected]>
