Commit a0721c13 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

jack: simplify build rules

parent 6975a29a
......@@ -3636,7 +3636,8 @@ dnl
AC_ARG_ENABLE(jack,
[AS_HELP_STRING([--disable-jack],
[do not use jack (default auto)])])
if test "${enable_jack}" != "no" ; then
have_jack="no"
AS_IF([test "${enable_jack}" != "no"], [
PKG_CHECK_MODULES(JACK, jack >= 1.9.7,
[ have_jack=yes ],
[
......@@ -3650,12 +3651,8 @@ if test "${enable_jack}" != "no" ; then
[AC_MSG_WARN([${JACK_PKG_ERRORS}.])])
])
])
if test "x${have_jack}" = "xyes" ; then
VLC_ADD_PLUGIN([jack access_jack])
VLC_ADD_LIBS([jack access_jack],[$JACK_LIBS])
VLC_ADD_CFLAGS([jack access_jack],[$JACK_CFLAGS])
fi
fi
])
AM_CONDITIONAL([HAVE_JACK], [test "${have_jack}" != "no"])
dnl
dnl OpenSLES Android
......
......@@ -65,7 +65,6 @@ SOURCES_linsys_hdsdi = \
linsys/linsys_sdiaudio.h \
linsys/linsys_sdivideo.h \
$(NULL)
SOURCES_access_jack = jack.c
SOURCES_access_mtp = mtp.c
SOURCES_access_imem = imem.c
SOURCES_access_attachment = attachment.c
......@@ -143,6 +142,13 @@ if HAVE_ALSA
libvlc_LTLIBRARIES += libaccess_alsa_plugin.la
endif
libaccess_jack_plugin_la_SOURCES = jack.c
libaccess_jack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
libaccess_jack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS)
if HAVE_JACK
libvlc_LTLIBRARIES += libaccess_jack_plugin.la
endif
libpulsesrc_plugin_la_SOURCES = pulse.c
libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la \
......
......@@ -66,8 +66,9 @@ endif
libjack_plugin_la_SOURCES = jack.c volume.h
libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
libjack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS) $(LIBM)
EXTRA_LTLIBRARIES += libjack_plugin.la
libvlc_LTLIBRARIES += $(LTLIBjack)
if HAVE_JACK
libvlc_LTLIBRARIES += libjack_plugin.la
endif
libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
libmmdevice_plugin_la_CFLAGS = $(AM_CFLAGS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment