[vlc-commits] PulseAudio: compile helper only once (refs #9367)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Sep 13 22:49:42 2013 +0300| [d259081ad4b8925f4364b06aea97595919020613] | committer: Rémi Denis-Courmont

PulseAudio: compile helper only once (refs #9367)

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

 modules/Makefile.am                   |   19 +++++++++++++------
 modules/access/Modules.am             |    8 +++-----
 modules/access/pulse.c                |    2 +-
 modules/audio_output/Modules.am       |    5 +++--
 modules/audio_output/pulse.c          |    2 +-
 modules/services_discovery/Modules.am |    7 +++----
 modules/services_discovery/pulse.c    |    2 +-
 modules/{audio_output => }/vlcpulse.c |    0
 modules/{audio_output => }/vlcpulse.h |    0
 9 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index e622ecb..82d0cbd 100644
--- 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 1f6c574..5b81e14 100644
--- 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 7018330..a792d75 100644
--- 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 5c04aaa..3af36c7 100644
--- 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 b477740..ab049be 100644
--- 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 4f36784..8e12934 100644
--- 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 0b81950..92244ee 100644
--- 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