Merge pull request #1757 in FS/freeswitch from bugfix/FS-11947-do-not-install-test-binaries-when-doing-make-install to master

* commit '9c8de649b31012efab128601e7ba022567d78019':
  FS-11947: [Build-System] Do not install test binaries when doing make install.
This commit is contained in:
Mike Jerris 2019-07-23 10:37:14 -05:00
commit 65cd6ec1ed
7 changed files with 15 additions and 15 deletions

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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)