Commit d259081a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

PulseAudio: compile helper only once (refs #9367)

parent 3f77b01a
NULL =
noinst_LTLIBRARIES =
BASE_SUBDIRS = \
access \
audio_filter \
......@@ -29,11 +29,10 @@ EXTRA_SUBDIRS = \
altivec \
arm_neon \
hw/vdpau \
lua \
$(NULL)
lua
SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) .
SUBDIRS = . $(BASE_SUBDIRS)
DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if ENABLE_SOUT
SUBDIRS += access_output mux stream_out
endif
......@@ -55,11 +54,19 @@ endif
if BUILD_LUA
SUBDIRS += lua
endif
SUBDIRS += .
dist_noinst_SCRIPTS = genmf list.sh module.rc.in
dist_noinst_DATA = LIST
libvlc_pulse_la_SOURCES = vlcpulse.c vlcpulse.h
libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\"
libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
libvlc_pulse_la_LDFLAGS = -static
libvlc_pulse_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS)
if HAVE_PULSE
noinst_LTLIBRARIES += libvlc_pulse.la
endif
if HAVE_WIN32
module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status
$(AM_V_GEN) cd "$(top_builddir)" && $(SHELL) ./config.status --file="modules/$@"
......
......@@ -146,12 +146,10 @@ if HAVE_ALSA
libvlc_LTLIBRARIES += libaccess_alsa_plugin.la
endif
libpulsesrc_plugin_la_SOURCES = \
../audio_output/vlcpulse.c \
../audio_output/vlcpulse.h \
pulse.c
libpulsesrc_plugin_la_SOURCES = pulse.c
libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulsesrc_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS)
libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la \
$(AM_LIBADD) $(PULSE_LIBS)
if HAVE_PULSE
libvlc_LTLIBRARIES += libpulsesrc_plugin.la
endif
......
......@@ -29,7 +29,7 @@
#include <vlc_demux.h>
#include <vlc_plugin.h>
#include <pulse/pulseaudio.h>
#include "../audio_output/vlcpulse.h"
#include "../vlcpulse.h"
#define HELP_TEXT N_( \
"Pass pulse:// to open the default PulseAudio source, " \
......
......@@ -55,9 +55,10 @@ if HAVE_ALSA
libvlc_LTLIBRARIES += libalsa_plugin.la
endif
libpulse_plugin_la_SOURCES = vlcpulse.c vlcpulse.h pulse.c
libpulse_plugin_la_SOURCES = pulse.c
libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulse_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS) $(LIBM)
libpulse_plugin_la_LIBADD = ../libvlc_pulse.la \
$(AM_LIBADD) $(PULSE_LIBS) $(LIBM)
if HAVE_PULSE
libvlc_LTLIBRARIES += libpulse_plugin.la
endif
......
......@@ -32,7 +32,7 @@
#include <vlc_cpu.h>
#include <pulse/pulseaudio.h>
#include "vlcpulse.h"
#include "../vlcpulse.h"
#if !PA_CHECK_VERSION(0,9,22)
# include <vlc_xlib.h>
#endif
......
......@@ -13,11 +13,10 @@ if HAVE_WIN32
libsap_plugin_la_DEPENDENCIES = libsap_plugin.rc.o
endif
libpulselist_plugin_la_SOURCES = \
../audio_output/vlcpulse.c ../audio_output/vlcpulse.h \
pulse.c
libpulselist_plugin_la_SOURCES = pulse.c
libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulselist_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS)
libpulselist_plugin_la_LIBADD = ../libvlc_pulse.la \
$(AM_LIBADD) $(PULSE_LIBS)
if HAVE_PULSE
libvlc_LTLIBRARIES += libpulselist_plugin.la
endif
......
......@@ -31,7 +31,7 @@
#include <vlc_plugin.h>
#include <vlc_services_discovery.h>
#include <pulse/pulseaudio.h>
#include "../audio_output/vlcpulse.h"
#include "../vlcpulse.h"
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
......
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