[vlc-commits] accesstweaks: compile as part of test suite

Rémi Denis-Courmont git at videolan.org
Tue Nov 28 18:20:13 CET 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 28 19:18:32 2017 +0200| [8ff4b51484d41f125e034b0fea69889dc77acf98] | committer: Rémi Denis-Courmont

accesstweaks: compile as part of test suite

This avoids having to enable it explicitly in configure, while also not
installing it by default outside build trees. In the unlikely event
that you actually want to install the plugin, you can still do so but
manually (e.g. libtool install mode).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8ff4b51484d41f125e034b0fea69889dc77acf98
---

 configure.ac                      | 8 --------
 modules/Makefile.am               | 1 +
 modules/stream_filter/Makefile.am | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index c46819ff3d..62ce59aff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4090,14 +4090,6 @@ AS_IF([test "${enable_kwallet}" != "no" -a "${have_dbus}" = "yes"], [
 ])
 
 dnl
-dnl  Developers helper modules (should be hidden from configure help)
-dnl
-AC_ARG_ENABLE(devtools, [], [], [enable_devtools="no"])
-AS_IF([test "${enable_devtools}" != "no"], [
-  VLC_ADD_PLUGIN([accesstweaks])
-])
-
-dnl
 dnl update checking system
 dnl
 AC_ARG_ENABLE(update-check,
diff --git a/modules/Makefile.am b/modules/Makefile.am
index ff7687bede..53b90a2713 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,4 +1,5 @@
 noinst_LTLIBRARIES =
+check_LTLIBRARIES =
 pkglib_LTLIBRARIES =
 noinst_HEADERS =
 check_PROGRAMS =
diff --git a/modules/stream_filter/Makefile.am b/modules/stream_filter/Makefile.am
index 50d99faac9..cd9da18320 100644
--- a/modules/stream_filter/Makefile.am
+++ b/modules/stream_filter/Makefile.am
@@ -45,10 +45,8 @@ stream_filter_LTLIBRARIES += $(LTLIBaribcam)
 EXTRA_LTLIBRARIES += libaribcam_plugin.la
 
 libaccesstweaks_plugin_la_SOURCES = stream_filter/accesstweaks.c
-libaccesstweaks_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccesstweaks_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(stream_filterdir)'
-stream_filter_LTLIBRARIES += $(LTLIBaccesstweaks)
-EXTRA_LTLIBRARIES += libaccesstweaks_plugin.la
+check_LTLIBRARIES += libaccesstweaks_plugin.la
 
 libadf_plugin_la_SOURCES = stream_filter/adf.c
 stream_filter_LTLIBRARIES += libadf_plugin.la



More information about the vlc-commits mailing list