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
changes/11/12711/5
Maxim Suraev 4 years ago
parent 18428bb4cf
commit 65d937c45c
  1. 1
      .gitignore
  2. 16
      src/Makefile.am

1
.gitignore vendored

@ -59,3 +59,4 @@ tests/testsuite
tests/testsuite.log
writtenconfig/
libintern.la

@ -1,4 +1,4 @@
LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
LDADD = libintern.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
AM_CPPFLAGS = \
$(all_includes) \
@ -9,8 +9,6 @@ AM_CFLAGS = \
-Wall \
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOVTY_CFLAGS) \
$(LIBMNL_CFLAGS) \
$(NULL)
AM_LDFLAGS = \
@ -22,6 +20,12 @@ bin_PROGRAMS = \
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_LDADD = $(LDADD) \
osmo_sysmon_SOURCES = \
value_node.c \
simple_ctrl.c \
osysmon_ctrl.c \
osysmon_sysinfo.c \
osysmon_rtnl.c \
@ -37,11 +40,6 @@ osmo_sysmon_SOURCES = \
osysmon_main.c \
$(NULL)
osmo_ctrl_client_SOURCES = \
simple_ctrl.c \
osmo-ctrl-client.c \
$(NULL)
noinst_HEADERS = \
osysmon.h \
simple_ctrl.h \

Loading…
Cancel
Save