X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2FModules.am;h=677a7d8757f519d8c1b1a575bbee7b698c253966;hb=a0721c13f2ca2badb9b79701e47333156bcbb58b;hp=a8c320642f6b5a0d07a411d3de534c273312f515;hpb=1ba853ac922b9233602f80983cdc3548aac3b28e;p=vlc

diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index a8c320642f..677a7d8757 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -1,5 +1,6 @@
 SOURCES_waveout = waveout.c windows_audio_common.h
 SOURCES_auhal = TPCircularBuffer.h TPCircularBuffer.c auhal.c
+SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
 SOURCES_audioqueue = audioqueue.c
 
 libopensles_android_plugin_la_SOURCES = opensles_android.c
@@ -17,14 +18,23 @@ endif
 libadummy_plugin_la_SOURCES = adummy.c
 libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
 libadummy_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libadummy_plugin_la_DEPENDENCIES = libadummy_plugin.rc.o
+endif
 
 libafile_plugin_la_SOURCES = file.c
 libafile_plugin_la_CFLAGS = $(AM_CFLAGS)
 libafile_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libafile_plugin_la_DEPENDENCIES = libafile_plugin.rc.o
+endif
 
 libamem_plugin_la_SOURCES = amem.c
 libamem_plugin_la_CFLAGS = $(AM_CFLAGS)
 libamem_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libamem_plugin_la_DEPENDENCIES = libamem_plugin.rc.o
+endif
 
 libvlc_LTLIBRARIES += \
 	libadummy_plugin.la \
@@ -45,22 +55,27 @@ 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
 
-libjack_plugin_la_SOURCES = jack.c packet.c volume.h
+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)
 libmmdevice_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser
+if HAVE_WIN32
+libmmdevice_plugin_la_DEPENDENCIES = libmmdevice_plugin.rc.o
+endif
 if HAVE_WASAPI
 libvlc_LTLIBRARIES += libmmdevice_plugin.la
 endif
@@ -68,6 +83,9 @@ endif
 libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h
 libdirectsound_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdirectsound_plugin_la_LIBADD = $(AM_LIBADD) -lole32
+if HAVE_WIN32
+libdirectsound_plugin_la_DEPENDENCIES = libdirectsound_plugin.rc.o
+endif
 if HAVE_DIRECTX
 libvlc_LTLIBRARIES += libdirectsound_plugin.la
 endif