aout: reset stereo-mode when a new aout is created
[vlc.git] / src / Makefile.am
index bd8297e..6b661a6 100644 (file)
@@ -87,6 +87,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_sout.h \
        ../include/vlc_spu.h \
        ../include/vlc_stream.h \
+       ../include/vlc_stream_extractor.h \
        ../include/vlc_strings.h \
        ../include/vlc_subpicture.h \
        ../include/vlc_text_style.h \
@@ -106,7 +107,6 @@ pluginsinclude_HEADERS = \
 nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
-       ../include/vlc_codec_synchro.h \
        ../include/vlc_codecs.h \
        ../include/vlc_extensions.h \
        ../include/vlc_fixups.h \
@@ -230,7 +230,6 @@ libvlccore_la_SOURCES = \
        input/clock.c \
        input/control.c \
        input/decoder.c \
-       input/decoder_synchro.c \
        input/demux.c \
        input/demux_chained.c \
        input/es_out.c \
@@ -246,6 +245,7 @@ libvlccore_la_SOURCES = \
        input/es_out_timeshift.h \
        input/event.h \
        input/item.h \
+       input/mrl_helpers.h \
        input/stream.h \
        input/input_internal.h \
        input/input_interface.h \
@@ -253,9 +253,11 @@ libvlccore_la_SOURCES = \
        input/vlm_event.h \
        input/resource.h \
        input/resource.c \
+       input/services_discovery.c \
        input/stats.c \
        input/stream.c \
        input/stream_fifo.c \
+       input/stream_extractor.c \
        input/stream_filter.c \
        input/stream_memory.c \
        input/subtitles.c \
@@ -306,6 +308,8 @@ libvlccore_la_SOURCES = \
        text/filesystem.c \
        text/iso_lang.c \
        text/iso-639_def.h \
+       misc/background_worker.c \
+       misc/background_worker.h \
        misc/md5.c \
        misc/probe.c \
        misc/rand.c \
@@ -332,12 +336,10 @@ libvlccore_la_SOURCES = \
        misc/messages.c \
        misc/mime.c \
        misc/objects.c \
+       misc/objres.c \
        misc/variables.h \
        misc/variables.c \
        misc/error.c \
-       misc/update.h \
-       misc/update.c \
-       misc/update_crypto.c \
        misc/xml.c \
        misc/addons.c \
        misc/filter.c \
@@ -381,6 +383,16 @@ libvlccore_la_SOURCES += \
        os2/rand.c \
        os2/thread.c
 else
+if HAVE_NACL
+libvlccore_la_SOURCES += \
+       android/error.c \
+       posix/dirs.c \
+       posix/filesystem.c \
+       posix/netconf.c \
+       posix/rand.c \
+       posix/specific.c \
+       posix/timer.c
+else
 libvlccore_la_SOURCES += \
        posix/filesystem.c \
        posix/plugin.c \
@@ -390,7 +402,10 @@ if HAVE_ANDROID
 libvlccore_la_SOURCES += \
        android/error.c \
        android/specific.c \
-       android/thread.c
+       android/thread.c \
+       linux/cpu.c \
+       linux/dirs.c \
+       linux/thread.c
 else
 if HAVE_DARWIN
 libvlccore_la_SOURCES += \
@@ -421,6 +436,7 @@ endif
 endif
 endif
 endif
+endif
 
 if BUILD_HTTPD
 libvlccore_la_SOURCES += network/httpd.c
@@ -435,6 +451,15 @@ libvlccore_la_SOURCES += input/vlm.c input/vlm_event.c input/vlmshell.c
 endif
 endif
 
+if UPDATE_CHECK
+libvlccore_la_SOURCES += \
+       misc/update.h misc/update.c \
+       misc/update_crypto.c
+AM_CPPFLAGS += -DUPDATE_CHECK
+AM_CFLAGS += $(GCRYPT_CFLAGS)
+libvlccore_la_LIBADD += $(GCRYPT_LIBS)
+endif
+
 libvlccore_la_LDFLAGS = \
        $(LDFLAGS_libvlccore) \
        -no-undefined \
@@ -443,7 +468,7 @@ libvlccore_la_LDFLAGS = \
 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 -Wc,-static
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static $(LIBCOM)
 endif
 if HAVE_OS2
 libvlccore_la_LDFLAGS += -avoid-version
@@ -451,8 +476,11 @@ endif
 if HAVE_DBUS
 libvlccore_la_LIBADD += $(DBUS_LIBS)
 endif
+if HAVE_DARWIN
+libvlccore_la_LDFLAGS += -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
+endif
 
-libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlc.dll.manifest
        $(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 # FourCC tables
@@ -466,7 +494,7 @@ fourcc_gen$(BUILDEXEEXT): misc/fourcc_gen.c misc/fourcc_list.h ../include/vlc_fo
 
 fourcc_tables.h: fourcc_gen$(BUILDEXEEXT)
        $(AM_V_at)rm -f -- $@.tmp
-       $(AM_V_GEN)$(builddir)/fourcc_gen > $@.tmp
+       $(AM_V_GEN)$(builddir)/fourcc_gen$(BUILDEXEEXT) > $@.tmp
        $(AM_V_at)mv -f -- $@.tmp $@
 
 # Unit/regression tests
@@ -482,7 +510,8 @@ check_PROGRAMS = \
        test_url \
        test_utf8 \
        test_xmlent \
-       test_headers
+       test_headers \
+       test_mrl_helpers
 
 TESTS = $(check_PROGRAMS) check_symbols
 
@@ -501,6 +530,7 @@ test_url_SOURCES = test/url.c
 test_utf8_SOURCES = test/utf8.c
 test_xmlent_SOURCES = test/xmlent.c
 test_headers_SOURCES = test/headers.c
+test_mrl_helpers_SOURCES = test/mrl_helpers.c
 
 AM_LDFLAGS = -no-install
 LDADD = libvlccore.la \