[vlc-commits] aout: remove Makefile recursion
Rémi Denis-Courmont
git at videolan.org
Sun Sep 22 16:08:40 CEST 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 22 16:15:14 2013 +0300| [fe3d8caa723eae6ec47d96be9c887c25c57d1100] | committer: Rémi Denis-Courmont
aout: remove Makefile recursion
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe3d8caa723eae6ec47d96be9c887c25c57d1100
---
configure.ac | 1 -
modules/Makefile.am | 2 +-
modules/audio_output/Makefile.am | 44 ++++++++++++++++---------------
modules/audio_output/TPCircularBuffer.c | 2 +-
modules/audio_output/alsa.c | 2 +-
modules/audio_output/audiotrack.c | 2 +-
modules/audio_output/directsound.c | 2 +-
modules/audio_output/jack.c | 2 +-
modules/audio_output/kai.c | 2 +-
modules/audio_output/mmdevice.c | 2 +-
modules/audio_output/pulse.c | 2 +-
modules/audio_output/wasapi.c | 2 +-
modules/audio_output/waveout.c | 2 +-
13 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/configure.ac b/configure.ac
index 554b5c9..4a0cc2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4198,7 +4198,6 @@ AC_CONFIG_FILES([
modules/access_output/Makefile
modules/audio_filter/Makefile
modules/audio_mixer/Makefile
- modules/audio_output/Makefile
modules/control/Makefile
modules/gui/Makefile
modules/gui/macosx/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index eb0fa40..c7fee3c 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -5,7 +5,6 @@ BASE_SUBDIRS = \
access/rtp \
audio_filter \
audio_mixer \
- audio_output \
control \
gui \
misc \
@@ -56,6 +55,7 @@ endif
include common.am
include access/Makefile.am
+include audio_output/Makefile.am
include codec/Makefile.am
include demux/Makefile.am
include meta_engine/Makefile.am
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
index ff69d62..8a0157e 100644
--- a/modules/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -1,13 +1,10 @@
aoutdir = $(pluginsdir)/audio_output
aout_LTLIBRARIES =
-EXTRA_LTLIBRARIES =
-include ../common.am
-
-libopensles_android_plugin_la_SOURCES = opensles_android.c
+libopensles_android_plugin_la_SOURCES = audio_output/opensles_android.c
libopensles_android_plugin_la_LIBADD = $(LIBDL) $(LIBM)
-libandroid_audiotrack_plugin_la_SOURCES = audiotrack.c
+libandroid_audiotrack_plugin_la_SOURCES = audio_output/audiotrack.c
libandroid_audiotrack_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libandroid_audiotrack_plugin_la_LIBADD = $(LIBDL)
@@ -15,80 +12,85 @@ if HAVE_ANDROID
aout_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
endif
-libadummy_plugin_la_SOURCES = adummy.c
+libadummy_plugin_la_SOURCES = audio_output/adummy.c
-libafile_plugin_la_SOURCES = file.c
+libafile_plugin_la_SOURCES = audio_output/file.c
libafile_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-libamem_plugin_la_SOURCES = amem.c
+libamem_plugin_la_SOURCES = audio_output/amem.c
aout_LTLIBRARIES += \
libadummy_plugin.la \
libafile_plugin.la \
libamem_plugin.la
-liboss_plugin_la_SOURCES = oss.c volume.h
+liboss_plugin_la_SOURCES = audio_output/oss.c audio_output/volume.h
liboss_plugin_la_LIBADD = $(OSS_LIBS) $(LIBM)
if HAVE_OSS
aout_LTLIBRARIES += liboss_plugin.la
endif
-libalsa_plugin_la_SOURCES = alsa.c volume.h
+libalsa_plugin_la_SOURCES = audio_output/alsa.c audio_output/volume.h
libalsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
libalsa_plugin_la_LIBADD = $(ALSA_LIBS) $(LIBM)
if HAVE_ALSA
aout_LTLIBRARIES += libalsa_plugin.la
endif
-libpulse_plugin_la_SOURCES = pulse.c
+libpulse_plugin_la_SOURCES = audio_output/pulse.c
libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
-libpulse_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS) $(LIBM)
+libpulse_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS) $(LIBM)
if HAVE_PULSE
aout_LTLIBRARIES += libpulse_plugin.la
endif
-libjack_plugin_la_SOURCES = jack.c volume.h
+libjack_plugin_la_SOURCES = audio_output/jack.c audio_output/volume.h
libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
libjack_plugin_la_LIBADD = $(JACK_LIBS) $(LIBM)
if HAVE_JACK
aout_LTLIBRARIES += libjack_plugin.la
endif
-libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
+libmmdevice_plugin_la_SOURCES = audio_output/mmdevice.c audio_output/mmdevice.h \
+ audio_output/wasapi.c
libmmdevice_plugin_la_LIBADD = -lole32 -lksuser
if HAVE_WASAPI
aout_LTLIBRARIES += libmmdevice_plugin.la
endif
-libdirectsound_plugin_la_SOURCES = directsound.c windows_audio_common.h
+libdirectsound_plugin_la_SOURCES = audio_output/directsound.c \
+ audio_output/windows_audio_common.h
libdirectsound_plugin_la_LIBADD = -lole32
if HAVE_DIRECTX
aout_LTLIBRARIES += libdirectsound_plugin.la
endif
-libkai_plugin_la_SOURCES = kai.c
+libkai_plugin_la_SOURCES = audio_output/kai.c
libkai_plugin_la_LIBADD = $(KAI_LIBS)
if HAVE_KAI
aout_LTLIBRARIES += libkai_plugin.la
endif
-libsndio_plugin_la_SOURCES = sndio.c
+libsndio_plugin_la_SOURCES = audio_output/sndio.c
libsndio_plugin_la_LIBADD = -lsndio
if HAVE_SNDIO
aout_LTLIBRARIES += libsndio_plugin.la
endif
-libwaveout_plugin_la_SOURCES = waveout.c windows_audio_common.h
+libwaveout_plugin_la_SOURCES = audio_output/waveout.c \
+ audio_output/windows_audio_common.h
libwaveout_plugin_la_LIBADD = -lwinmm
if HAVE_WIN32
aout_LTLIBRARIES += libwaveout_plugin.la
endif
-libauhal_plugin_la_SOURCES = TPCircularBuffer.h TPCircularBuffer.c auhal.c
+libauhal_plugin_la_SOURCES = audio_output/auhal.c \
+ audio_output/TPCircularBuffer.h audio_output/TPCircularBuffer.c
libauhal_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices -rpath '$(aoutdir)'
-libaudiounit_ios_plugin_la_SOURCES = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
+libaudiounit_ios_plugin_la_SOURCES = audio_output/audiounit_ios.c \
+ audio_output/TPCircularBuffer.h audio_output/TPCircularBuffer.c
libaudiounit_ios_plugin_la_LDFLAGS = $(libauhal_plugin_la_LDFLAGS)
-libaudioqueue_plugin_la_SOURCES = audioqueue.c
+libaudioqueue_plugin_la_SOURCES = audio_output/audioqueue.c
libaudioqueue_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices -rpath '$(aoutdir)'
EXTRA_LTLIBRARIES += libauhal_plugin.la libaudiounit_ios_plugin.la libaudioqueue_plugin.la
aout_LTLIBRARIES += $(LTLIBauhal) $(LTLIBaudiounit_ios) $(LTLIBaudioqueue)
diff --git a/modules/audio_output/TPCircularBuffer.c b/modules/audio_output/TPCircularBuffer.c
index 504189f..1f7f05f 100644
--- a/modules/audio_output/TPCircularBuffer.c
+++ b/modules/audio_output/TPCircularBuffer.c
@@ -6,7 +6,7 @@
// Copyright 2011-2012 A Tasty Pixel. All rights reserved.
-#include "TPCircularBuffer.h"
+#include "audio_output/TPCircularBuffer.h"
#include <mach/mach.h>
#include <stdio.h>
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 9c2e46a..c285d5f 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -53,7 +53,7 @@ struct aout_sys_t
char *device;
};
-#include "volume.h"
+#include "audio_output/volume.h"
#define A52_FRAME_NB 1536
diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
index 8f46a8d..d07053e 100644
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -122,7 +122,7 @@ struct aout_sys_t {
};
/* Soft volume helper */
-#include "volume.h"
+#include "audio_output/volume.h"
static void *InitLibrary(struct aout_sys_t *p_sys);
diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c
index 0ca3b59..949c85d 100644
--- a/modules/audio_output/directsound.c
+++ b/modules/audio_output/directsound.c
@@ -36,7 +36,7 @@
#include <vlc_aout.h>
#include <vlc_charset.h>
-#include "windows_audio_common.h"
+#include "audio_output/windows_audio_common.h"
#define DS_BUF_SIZE (6*1024*1024)
diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index 9fbebb9..2e8c1f8 100644
--- a/modules/audio_output/jack.c
+++ b/modules/audio_output/jack.c
@@ -75,7 +75,7 @@ static int TimeGet ( audio_output_t *, mtime_t * );
static int Process ( jack_nframes_t i_frames, void *p_arg );
static int GraphChange ( void *p_arg );
-#include "volume.h"
+#include "audio_output/volume.h"
#define AUTO_CONNECT_OPTION "jack-auto-connect"
#define AUTO_CONNECT_TEXT N_("Automatically connect to writable clients")
diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c
index 149ef05..d3cbb5a 100644
--- a/modules/audio_output/kai.c
+++ b/modules/audio_output/kai.c
@@ -84,7 +84,7 @@ static void DestroyBuffer( audio_output_t * );
static int ReadBuffer ( audio_output_t *, uint8_t *, int );
static int WriteBuffer ( audio_output_t *, uint8_t *, int );
-#include "volume.h"
+#include "audio_output/volume.h"
/*****************************************************************************
* Module descriptor
diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index 912247c..65ab2b8 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -40,7 +40,7 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd,
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_charset.h>
-#include "mmdevice.h"
+#include "audio_output/mmdevice.h"
DEFINE_GUID (GUID_VLC_AUD_OUT, 0x4533f59d, 0x59ee, 0x00c6,
0xad, 0xb2, 0xc6, 0x8b, 0x50, 0x1a, 0x66, 0x55);
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index ab049be..b477740 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/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 6d715f5..cbdcd62 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -32,7 +32,7 @@
#include <vlc_common.h>
#include <vlc_aout.h>
-#include "mmdevice.h"
+#include "audio_output/mmdevice.h"
static LARGE_INTEGER freq; /* performance counters frequency */
diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index a7fb8b6..478b7bb 100644
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -38,7 +38,7 @@
#include <vlc_aout.h>
#include <vlc_charset.h> /* FromWide() */
-#include "windows_audio_common.h"
+#include "audio_output/windows_audio_common.h"
#define FRAME_SIZE 4096 /* The size is in samples, not in bytes */
More information about the vlc-commits
mailing list