Real RTSP: discard unsupported legacy username and password syntax

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8f9a2371b9be0d03d0ff8b3d7daaf6c985015efc..1f0249433006764a9d6a949d0ad5b58dd1798731 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,11 +23,10 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
+       ../include/vlc_addons.h \
        ../include/vlc_aout.h \
-       ../include/vlc_aout_intf.h \
        ../include/vlc_aout_volume.h \
        ../include/vlc_arrays.h \
-       ../include/vlc_art_finder.h \
        ../include/vlc_atomic.h \
        ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
@@ -57,11 +56,13 @@ pluginsinclude_HEADERS = \
        ../include/vlc_inhibit.h \
        ../include/vlc_input.h \
        ../include/vlc_input_item.h \
+       ../include/vlc_interface.h \
        ../include/vlc_keys.h \
        ../include/vlc_main.h \
        ../include/vlc_md5.h \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
+       ../include/vlc_meta_fetcher.h \
        ../include/vlc_media_library.h \
        ../include/vlc_mime.h \
        ../include/vlc_modules.h \
@@ -77,7 +78,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_probe.h \
        ../include/vlc_rand.h \
        ../include/vlc_services_discovery.h \
-       ../include/vlc_sql.h \
+       ../include/vlc_fingerprinter.h \
        ../include/vlc_sout.h \
        ../include/vlc_spu.h \
        ../include/vlc_stream.h \
@@ -104,11 +105,9 @@ noinst_HEADERS = \
        ../include/vlc_codecs.h \
        ../include/vlc_extensions.h \
        ../include/vlc_fixups.h \
-       ../include/vlc_interface.h \
        ../include/vlc_intf_strings.h \
        ../include/vlc_iso_lang.h \
        ../include/vlc_memory.h \
-       ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
        ../include/vlc_update.h \
        ../include/vlc_vod.h \
@@ -165,9 +164,8 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 lib_LTLIBRARIES = libvlccore.la
 
 AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
-       -DMODULE_STRING=\"main\" \
+       -DMODULE_STRING=\"core\" \
        -DLOCALEDIR=\"$(localedir)\" \
-       -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DPKGDATADIR=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)
@@ -181,11 +179,10 @@ endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
 libvlccore_la_LDFLAGS = \
-       -no-undefined \
        $(LDFLAGS_libvlccore) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 5:0:0
+       -version-info 8:0:0
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
        ../compat/libcompat.la \
        $(LTLIBINTL) $(LTLIBICONV) \
@@ -193,7 +190,11 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
 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
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version \
+                                                -Wc,--static -Wc,-static-libgcc
+endif
+if HAVE_OS2
+libvlccore_la_LDFLAGS += -avoid-version
 endif
 if HAVE_DBUS
 libvlccore_la_LIBADD += $(DBUS_LIBS)
@@ -204,6 +205,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
 
 EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_darwin) \
+       $(SOURCES_libvlc_android) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_os2) \
@@ -215,6 +217,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
@@ -233,6 +238,7 @@ endif
 endif
 endif
 endif
+endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -244,18 +250,36 @@ endif
 endif
 
 SOURCES_libvlc_darwin = \
-       posix/darwin_dirs.c \
+       darwin/dirs.c \
        posix/filesystem.c \
        posix/plugin.c \
-       posix/thread.c \
+       darwin/thread.c \
        posix/timer.c \
-       posix/darwin_specific.c \
+       darwin/specific.c \
+       posix/rand.c \
+       darwin/error.c \
+       darwin/netconf.c \
+       $(NULL)
+
+SOURCES_libvlc_android = \
+       android/dirs.c \
+       android/thread.c \
+       android/error.c \
+       posix/filesystem.c \
+       android/netconf.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/error.c \
        posix/filesystem.c \
+       posix/netconf.c \
        posix/plugin.c \
        posix/thread.c \
        posix/timer.c \
@@ -267,9 +291,10 @@ SOURCES_libvlc_linux = \
 
 SOURCES_libvlc_win32 = \
        win32/dirs.c \
+       win32/error.c \
        win32/filesystem.c \
+       win32/netconf.c \
        win32/plugin.c \
-       misc/rwlock.c \
        win32/thread.c \
        win32/specific.c \
        win32/winsock.c \
@@ -286,9 +311,10 @@ SOURCES_libvlc_symbian = \
 SOURCES_libvlc_os2 = \
        os2/getaddrinfo.c \
        os2/dirs.c \
+       darwin/error.c \
        os2/filesystem.c \
+       os2/netconf.c \
        os2/plugin.c \
-       misc/rwlock.c \
        os2/thread.c \
        os2/specific.c \
        os2/rand.c \
@@ -296,7 +322,9 @@ SOURCES_libvlc_os2 = \
 
 SOURCES_libvlc_other = \
        posix/dirs.c \
+       posix/error.c \
        posix/filesystem.c \
+       posix/netconf.c \
        posix/thread.c \
        posix/timer.c \
        posix/plugin.c \
@@ -316,6 +344,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 \
@@ -377,14 +406,13 @@ SOURCES_libvlc_common = \
        video_output/snapshot.c \
        video_output/snapshot.h \
        video_output/statistic.h \
-       video_output/postprocessing.c \
-       video_output/postprocessing.h \
        video_output/video_output.c \
        video_output/video_text.c \
        video_output/video_epg.c \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
        video_output/window.c \
+       video_output/window.h \
        video_output/opengl.c \
        video_output/vout_intf.c \
        video_output/vout_internal.h \
@@ -394,12 +422,8 @@ SOURCES_libvlc_common = \
        audio_output/common.c \
        audio_output/dec.c \
        audio_output/filters.c \
-       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 \
        network/io.c \
        network/tcp.c \
@@ -418,6 +442,7 @@ SOURCES_libvlc_common = \
        misc/rand.c \
        misc/mtime.c \
        misc/block.c \
+       misc/fifo.c \
        misc/fourcc.c \
        misc/es_format.c \
        misc/picture.c \
@@ -455,13 +480,14 @@ SOURCES_libvlc_common = \
        misc/update.c \
        misc/update_crypto.c \
        misc/xml.c \
-       misc/media_library.c \
        extras/libc.c \
        extras/tdestroy.c \
+       misc/addons.c \
        misc/filter.c \
        misc/filter_chain.c \
        misc/http_auth.c \
-       misc/sql.c \
+       misc/httpcookies.c \
+       misc/fingerprinter.c \
        misc/text_style.c \
        misc/subpicture.c \
        misc/subpicture.h \
@@ -474,7 +500,6 @@ SOURCES_libvlc_httpd = \
 SOURCES_libvlc_sout = \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
-       stream_output/announce.c \
        stream_output/sap.c \
        stream_output/sdp.c \
        $(NULL)
@@ -496,6 +521,7 @@ check_PROGRAMS = \
        test_dictionary \
        test_i18n_atof \
        test_md5 \
+       test_picture_pool \
        test_timer \
        test_url \
        test_utf8 \
@@ -511,6 +537,7 @@ test_block_DEPENDENCIES =
 test_dictionary_SOURCES = test/dictionary.c
 test_i18n_atof_SOURCES = test/i18n_atof.c
 test_md5_SOURCES = test/md5.c
+test_picture_pool_SOURCES = test/picture_pool.c
 test_timer_SOURCES = test/timer.c
 test_url_SOURCES = test/url.c
 test_utf8_SOURCES = test/utf8.c