fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31786 )
Change subject: */Makefile.am: libraries shall not be in AM_LDFLAGS ......................................................................
*/Makefile.am: libraries shall not be in AM_LDFLAGS
Change-Id: Ie9df855ee09b0761bd617fab58ca26450ac0c754 --- M src/Makefile.am M src/libosmo-mgcp-client/Makefile.am M src/libosmo-mgcp/Makefile.am 3 files changed, 15 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/31786/1
diff --git a/src/Makefile.am b/src/Makefile.am index f994f57..3effa9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,12 +13,6 @@ $(COVERAGE_CFLAGS) \ $(NULL)
-AM_LDFLAGS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - # Libraries SUBDIRS = \ libosmo-mgcp-client \ diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 36d6ca6..488c070 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -13,12 +13,6 @@ $(COVERAGE_CFLAGS) \ $(NULL)
-AM_LDFLAGS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! MGCP_CLIENT_LIBVERSION=11:0:0 @@ -36,7 +30,12 @@ $(NULL)
libosmo_mgcp_client_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -version-info $(MGCP_CLIENT_LIBVERSION) \ -no-undefined \ $(NULL) + +libosmo_mgcp_client_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) diff --git a/src/libosmo-mgcp/Makefile.am b/src/libosmo-mgcp/Makefile.am index 309ae3f..8cffbe5 100644 --- a/src/libosmo-mgcp/Makefile.am +++ b/src/libosmo-mgcp/Makefile.am @@ -15,16 +15,6 @@ $(COVERAGE_CFLAGS) \ $(NULL)
-AM_LDFLAGS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMONETIF_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOTRAU_LIBS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - noinst_LIBRARIES = \ libosmo-mgcp.a \ $(NULL)