From 9428abb6ccfb197770c3b9da3576bd1bc0bba1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> Date: Sat, 28 Sep 2013 17:37:32 +0300 Subject: [PATCH] access/rtp: remove recursion --- configure.ac | 1 - modules/.gitignore | 2 ++ modules/Makefile.am | 5 ++- modules/access/rtp/.gitignore | 2 -- modules/access/rtp/Makefile.am | 61 ++++++++++++++++------------------ modules/stream_out/Modules.am | 2 +- 6 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 modules/access/rtp/.gitignore diff --git a/configure.ac b/configure.ac index 68866af0284c..3f6ab28d3070 100644 --- a/configure.ac +++ b/configure.ac @@ -4186,7 +4186,6 @@ AC_CONFIG_FILES([ lib/Makefile bin/Makefile test/Makefile - modules/access/rtp/Makefile modules/access_output/Makefile modules/audio_filter/Makefile modules/control/Makefile diff --git a/modules/.gitignore b/modules/.gitignore index 4798b99cf456..87bac2f094d8 100644 --- a/modules/.gitignore +++ b/modules/.gitignore @@ -1 +1,3 @@ plugins.dat +srtp-test-aes +srtp-test-recv diff --git a/modules/Makefile.am b/modules/Makefile.am index 0e76750d646a..dc0fb39e6384 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,8 +1,8 @@ noinst_LTLIBRARIES = noinst_HEADERS = +check_PROGRAMS = BASE_SUBDIRS = \ - access/rtp \ audio_filter \ control \ gui \ @@ -27,11 +27,14 @@ if HAVE_VDPAU SUBDIRS += hw/vdpau endif +TESTS = + dist_noinst_SCRIPTS = genmf list.sh module.rc.in dist_noinst_DATA = MODULES_LIST include common.am include access/Makefile.am +include access/rtp/Makefile.am include arm_neon/Makefile.am include audio_mixer/Makefile.am include audio_output/Makefile.am diff --git a/modules/access/rtp/.gitignore b/modules/access/rtp/.gitignore deleted file mode 100644 index c41c5cb832cd..000000000000 --- a/modules/access/rtp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -srtp-test-aes -srtp-test-recv diff --git a/modules/access/rtp/Makefile.am b/modules/access/rtp/Makefile.am index 634b2f3af871..bb2bb7438bbc 100644 --- a/modules/access/rtp/Makefile.am +++ b/modules/access/rtp/Makefile.am @@ -1,52 +1,49 @@ -include $(top_srcdir)/modules/common.am -accessdir = $(pluginsdir)/access - # RTP plugin -access_LTLIBRARIES = librtp_plugin.la +access_LTLIBRARIES += librtp_plugin.la librtp_plugin_la_SOURCES = \ - rtp.c \ - rtp.h \ - input.c \ - session.c \ - xiph.c + access/rtp/input.c \ + access/rtp/session.c \ + access/rtp/xiph.c \ + access/rtp/rtp.c access/rtp/rtp.h +librtp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/rtp librtp_plugin_la_CFLAGS = $(AM_CFLAGS) librtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD) # Secure RTP library -libvlc_srtp_la_SOURCES = srtp.c -libvlc_srtp_la_CPPFLAGS = +libvlc_srtp_la_SOURCES = access/rtp/srtp.c access/rtp/srtp.h +libvlc_srtp_la_CPPFLAGS = -I$(srcdir)/access/rtp libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS) libvlc_srtp_la_LDFLAGS = -static libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS) $(LIBPTHREAD) -srtp_test_recv_CPPFLAGS = +srtp_test_recv_SOURCES = access/rtp/srtp-test-recv.c srtp_test_recv_LDADD = libvlc_srtp.la -srtp_test_aes_CPPFLAGS = +srtp_test_aes_SOURCES = access/rtp/srtp-test-aes.c srtp_test_aes_LDADD = $(GCRYPT_LIBS) librtp_plugin_la_DEPENDENCIES = if HAVE_GCRYPT -noinst_HEADERS = srtp.h -noinst_LTLIBRARIES = libvlc_srtp.la +noinst_LTLIBRARIES += libvlc_srtp.la -check_PROGRAMS = srtp-test-aes srtp-test-recv -TESTS = $(check_PROGRAMS) +check_PROGRAMS += srtp-test-aes srtp-test-recv +TESTS += srtp-test-aes srtp-test-recv -librtp_plugin_la_CFLAGS += -DHAVE_SRTP $(GCRYPT_CFLAGS) +librtp_plugin_la_CPPFLAGS += -DHAVE_SRTP +librtp_plugin_la_CFLAGS += $(GCRYPT_CFLAGS) librtp_plugin_la_LIBADD += libvlc_srtp.la $(GCRYPT_LIBS) librtp_plugin_la_DEPENDENCIES += libvlc_srtp.la endif -lcov-run: - rm -Rf *.gcda lcov - $(MAKE) $(AM_MAKEFLAGS) check - -lcov-pre.out: - lcov -c -d . -o lcov.tmp - -lcov.out: lcov-pre.out - lcov -r lcov.tmp '*test*' > lcov.out - -lcov: lcov.out - genhtml lcov.out -o lcov - -.PHONY: lcov-run +#lcov-run: +# rm -Rf *.gcda lcov +# $(MAKE) $(AM_MAKEFLAGS) check +# +#lcov-pre.out: +# lcov -c -d . -o lcov.tmp +# +#lcov.out: lcov-pre.out +# lcov -r lcov.tmp '*test*' > lcov.out +# +#lcov: lcov.out +# genhtml lcov.out -o lcov +# +#.PHONY: lcov-run diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 0d9cd8a5326a..2340c64634b2 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -48,7 +48,7 @@ libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS) libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD) if HAVE_GCRYPT SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp -SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la +SRTP_LIBS = $(top_builddir)/modules/libvlc_srtp.la libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS) \ $(GCRYPT_CFLAGS) libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS) $(GCRYPT_LIBS) -- GitLab