[S] Change in libosmo-netif[master]: tests/Makefile.am: reorder libraries in LDADD

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31775 ) Change subject: tests/Makefile.am: reorder libraries in LDADD ...................................................................... tests/Makefile.am: reorder libraries in LDADD Otherwise the linker may pick system-installed libs instead. Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a --- M tests/Makefile.am 1 file changed, 18 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/75/31775/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index a21f0b1..c43419b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,12 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) -no-install +LDADD = \ + $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + check_PROGRAMS = \ osmux/osmux_test \ osmux/osmux_output_test \ @@ -12,22 +18,11 @@ check_HEADERS = osmux_osmux_test_SOURCES = osmux/osmux_test.c -osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - osmux_osmux_output_test_SOURCES = osmux/osmux_output_test.c -osmux_osmux_output_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - osmux_osmux_input_test_SOURCES = osmux/osmux_input_test.c -osmux_osmux_input_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - stream_stream_test_SOURCES = stream/stream_test.c -stream_stream_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - jibuf_jibuf_test_SOURCES = jibuf/jibuf_test.c -jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - amr_amr_test_SOURCES = amr/amr_test.c -amr_amr_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la if HAVE_PCAP check_PROGRAMS += jibuf/jibuf_tool @@ -45,11 +40,7 @@ osmo-pcap-test/l4_udp.c \ osmo-pcap-test/pcap.c -jibuf_jibuf_tool_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(top_builddir)/src/libosmonetif.la \ - -lpcap +jibuf_jibuf_tool_LDADD = $(LDADD) -lpcap endif # The `:;' works around a Bash 3.2 bug when the output is not writeable. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a Gerrit-Change-Number: 31775 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange