aout: handle filters creation/deletion from decoder, fix memory leak

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9572480f47408d492d390dd90fe128297102be3c..663351e8392101dd108d93a4ac8e93148333fd83 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,6 @@ pluginsincludedir = $(pkgincludedir)/plugins
 pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
        ../include/vlc_aout.h \
-       ../include/vlc_aout_intf.h \
        ../include/vlc_aout_volume.h \
        ../include/vlc_arrays.h \
        ../include/vlc_art_finder.h \
@@ -167,13 +166,16 @@ lib_LTLIBRARIES = libvlccore.la
 AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
-       -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DPKGDATADIR=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)
 if HAVE_DYNAMIC_PLUGINS
 AM_CPPFLAGS += -DHAVE_DYNAMIC_PLUGINS
 endif
+if HAVE_DBUS
+AM_CPPFLAGS += -DHAVE_DBUS
+AM_CFLAGS += $(DBUS_CFLAGS)
+endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
 libvlccore_la_LDFLAGS = \
@@ -185,18 +187,22 @@ libvlccore_la_LDFLAGS = \
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
        ../compat/libcompat.la \
        $(LTLIBINTL) $(LTLIBICONV) \
-       $(IDN_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
+       $(IDN_LIBS) $(LIBPTHREAD) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
 libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
 endif
+if HAVE_DBUS
+libvlccore_la_LIBADD += $(DBUS_LIBS)
+endif
 
 libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_darwin) \
+       $(SOURCES_libvlc_android) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_os2) \
@@ -208,6 +214,9 @@ EXTRA_libvlccore_la_SOURCES = \
 if HAVE_DARWIN
 libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
 else
+if HAVE_ANDROID
+libvlccore_la_SOURCES += $(SOURCES_libvlc_android)
+else
 if HAVE_LINUX
 libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
 else
@@ -226,6 +235,7 @@ endif
 endif
 endif
 endif
+endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -246,6 +256,18 @@ SOURCES_libvlc_darwin = \
        posix/rand.c \
        $(NULL)
 
+SOURCES_libvlc_android = \
+       android/dirs.c \
+       android/thread.c \
+       posix/filesystem.c \
+       posix/plugin.c \
+       posix/timer.c \
+       posix/linux_cpu.c \
+       posix/linux_specific.c \
+       posix/specific.c \
+       posix/rand.c \
+       $(NULL)
+
 SOURCES_libvlc_linux = \
        posix/dirs.c \
        posix/filesystem.c \
@@ -307,6 +329,7 @@ SOURCES_libvlc_common = \
        playlist/playlist_internal.h \
        playlist/art.c \
        playlist/art.h \
+       playlist/aout.c \
        playlist/thread.c \
        playlist/control.c \
        playlist/engine.c \
@@ -388,7 +411,6 @@ SOURCES_libvlc_common = \
        audio_output/input.c \
        audio_output/output.c \
        audio_output/volume.c \
-       audio_output/intf.c \
        osd/osd.c \
        osd/osd_text.c \
        network/getaddrinfo.c \