From 9c8de649b31012efab128601e7ba022567d78019 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Tue, 23 Jul 2019 19:34:21 +0400 Subject: [PATCH] FS-11947: [Build-System] Do not install test binaries when doing make install. --- src/mod/applications/mod_av/Makefile.am | 4 ++-- src/mod/applications/mod_http_cache/test/Makefile.am | 4 ++-- src/mod/applications/mod_test/test/Makefile.am | 4 ++-- src/mod/endpoints/mod_sofia/Makefile.am | 4 ++-- src/mod/event_handlers/mod_rayo/test/Makefile.am | 4 ++-- src/mod/languages/mod_lua/test/Makefile.am | 4 ++-- tests/unit/Makefile.am | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/mod/applications/mod_av/Makefile.am b/src/mod/applications/mod_av/Makefile.am index 4400f07095..70efce9122 100644 --- a/src/mod/applications/mod_av/Makefile.am +++ b/src/mod/applications/mod_av/Makefile.am @@ -22,10 +22,10 @@ mod_av_la_LIBADD = libavmod.la $(switch_builddir)/libfreeswitch.la $(AVFORMAT_ mod_av_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz -bin_PROGRAMS = test/test_mod_av test/test_avformat +noinst_PROGRAMS = test/test_mod_av test/test_avformat AM_CFLAGS = $(SWITCH_AM_CFLAGS) -I../ $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(RESAMPLE_CFLAGS) AM_LDFLAGS = $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS) $(AVUTIL_LIBS) $(RESAMPLE_LIBS) -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS) test_test_mod_av_LDADD = libavmod.la $(switch_builddir)/libfreeswitch.la test_test_avformat_LDADD = libavmod.la $(switch_builddir)/libfreeswitch.la diff --git a/src/mod/applications/mod_http_cache/test/Makefile.am b/src/mod/applications/mod_http_cache/test/Makefile.am index 76561fca3b..341c0cada7 100644 --- a/src/mod/applications/mod_http_cache/test/Makefile.am +++ b/src/mod/applications/mod_http_cache/test/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = test_aws +noinst_PROGRAMS = test_aws AM_CFLAGS = $(SWITCH_AM_CFLAGS) AM_LDFLAGS = $(switch_builddir)/libfreeswitch.la -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) ../mod_http_cache.la -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS) diff --git a/src/mod/applications/mod_test/test/Makefile.am b/src/mod/applications/mod_test/test/Makefile.am index ed630acae0..54825db400 100644 --- a/src/mod/applications/mod_test/test/Makefile.am +++ b/src/mod/applications/mod_test/test/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/build/modmake.rulesam -bin_PROGRAMS = test_asr +noinst_PROGRAMS = test_asr test_asr_CFLAGS = $(AM_CFLAGS) -I../ test_asr_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) ../mod_test.la $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS) diff --git a/src/mod/endpoints/mod_sofia/Makefile.am b/src/mod/endpoints/mod_sofia/Makefile.am index e1da6b7dee..d63e029801 100644 --- a/src/mod/endpoints/mod_sofia/Makefile.am +++ b/src/mod/endpoints/mod_sofia/Makefile.am @@ -39,13 +39,13 @@ mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -shared BUILT_SOURCES = $(SOFIALA) -bin_PROGRAMS = test/test_sofia_funcs +noinst_PROGRAMS = test/test_sofia_funcs test_test_sofia_funcs_SOURCES = test/test_sofia_funcs.c test_test_sofia_funcs_CFLAGS = $(AM_CFLAGS) -I $(libsofiamod_la_CFLAGS) test_test_sofia_funcs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) $(SOFIALA) test_test_sofia_funcs_LDADD = libsofiamod.la $(SOFIALA) -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS) if ISMAC mod_sofia_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration diff --git a/src/mod/event_handlers/mod_rayo/test/Makefile.am b/src/mod/event_handlers/mod_rayo/test/Makefile.am index 0648275b0e..b670dcf10f 100644 --- a/src/mod/event_handlers/mod_rayo/test/Makefile.am +++ b/src/mod/event_handlers/mod_rayo/test/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/build/modmake.rulesam -bin_PROGRAMS = test_iks test_nlsml test_srgs +noinst_PROGRAMS = test_iks test_nlsml test_srgs test_iks_CFLAGS = $(AM_CFLAGS) -I../ -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) ../mod_rayo.la $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) @@ -10,4 +10,4 @@ test_nlsml_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDF test_srgs_CFLAGS = $(AM_CFLAGS) -I../ -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) test_srgs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) ../mod_rayo.la $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS) diff --git a/src/mod/languages/mod_lua/test/Makefile.am b/src/mod/languages/mod_lua/test/Makefile.am index 683cb53966..8db9324b98 100644 --- a/src/mod/languages/mod_lua/test/Makefile.am +++ b/src/mod/languages/mod_lua/test/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = test_mod_lua +noinst_PROGRAMS = test_mod_lua AM_CFLAGS = $(SWITCH_AM_CFLAGS) AM_LDFLAGS = $(switch_builddir)/libfreeswitch.la -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS) diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index dff3fc3662..71d6c86d60 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,11 +1,11 @@ include $(top_srcdir)/build/modmake.rulesam -bin_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx \ +noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx \ switch_ivr_play_say -bin_PROGRAMS+= switch_core_video +noinst_PROGRAMS+= switch_core_video AM_LDFLAGS = -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) $(openssl_LIBS) AM_LDFLAGS += $(FREESWITCH_LIBS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) AM_CFLAGS = $(SWITCH_AM_CPPFLAGS) AM_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -TESTS = $(bin_PROGRAMS) +TESTS = $(noinst_PROGRAMS)