PulseAudio: compile helper only once (refs #9367)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index e622ecb9d4923c734ca3be43de5e63d22784b1ac..82d0cbdef2fd3bf93ac852a912fb3343d79073c1 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,4 +1,4 @@
-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/$@"

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 1f6c57454c98956fe4fccf1ae591e9351cf0a273..5b81e14ed0fd2b1ad4af0d8f6ac7396461dae8d1 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -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

diff --git a/modules/access/pulse.c b/modules/access/pulse.c
index 7018330a4f8928d499f79f0f5048332e1bd914a6..a792d75cfac66c8a20bea7a0891dc4a3d11599ac 100644 (file)
--- a/modules/access/pulse.c
+++ b/modules/access/pulse.c
@@ -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, " \

diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 5c04aaae7492fca6112f8bc7d9a0850ee822bc0f..3af36c70c6ddd4c93bc9f5dbc5effc2956566219 100644 (file)
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -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

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index b477740c47ea30dce9a40e03d2ac35937f8b43ac..ab049be38a43830191b3abe616c03218fc2a42f8 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -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

diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am
index 4f36784660c921f7a6ef6655875617198ac8651a..8e12934c22d996216f0cdfbf01a07c5891bb1269 100644 (file)
--- a/modules/services_discovery/Modules.am
+++ b/modules/services_discovery/Modules.am
@@ -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

diff --git a/modules/services_discovery/pulse.c b/modules/services_discovery/pulse.c
index 0b81950a4a9b74433ec1ba4fb4e17b2170d068f2..92244eef24c6c9ab8e5ad601e4e811ba3e3bcdc1 100644 (file)
--- a/modules/services_discovery/pulse.c
+++ b/modules/services_discovery/pulse.c
@@ -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 *);

diff --git a/modules/audio_output/vlcpulse.c b/modules/vlcpulse.c
similarity index 100%
rename from modules/audio_output/vlcpulse.c
rename to modules/vlcpulse.c

diff --git a/modules/audio_output/vlcpulse.h b/modules/vlcpulse.h
similarity index 100%
rename from modules/audio_output/vlcpulse.h
rename to modules/vlcpulse.h