X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=1f0249433006764a9d6a949d0ad5b58dd1798731;hb=refs%2Fheads%2Fmaster;hp=8d18e66b1e5de007aa1b0d8d8694f0ac75ba6467;hpb=1c3973d7fe1891e3019fce9b4f0239edfd48c55d;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d18e66b1e..1f02494330 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,10 +23,10 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
+	../include/vlc_addons.h \
 	../include/vlc_aout.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 \
@@ -56,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 \
@@ -103,7 +105,6 @@ 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 \
@@ -181,7 +182,7 @@ libvlccore_la_LDFLAGS = \
 	$(LDFLAGS_libvlccore) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 7:0:0
+	-version-info 8:0:0
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
 	../compat/libcompat.la \
 	$(LTLIBINTL) $(LTLIBICONV) \
@@ -189,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)
@@ -252,12 +257,14 @@ SOURCES_libvlc_darwin = \
 	posix/timer.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 \
@@ -270,6 +277,7 @@ SOURCES_libvlc_android = \
 
 SOURCES_libvlc_linux = \
 	posix/dirs.c \
+	posix/error.c \
 	posix/filesystem.c \
 	posix/netconf.c \
 	posix/plugin.c \
@@ -283,6 +291,7 @@ SOURCES_libvlc_linux = \
 
 SOURCES_libvlc_win32 = \
 	win32/dirs.c \
+	win32/error.c \
 	win32/filesystem.c \
 	win32/netconf.c \
 	win32/plugin.c \
@@ -302,6 +311,7 @@ SOURCES_libvlc_symbian = \
 SOURCES_libvlc_os2 = \
 	os2/getaddrinfo.c \
 	os2/dirs.c \
+	darwin/error.c \
 	os2/filesystem.c \
 	os2/netconf.c \
 	os2/plugin.c \
@@ -312,6 +322,7 @@ SOURCES_libvlc_os2 = \
 
 SOURCES_libvlc_other = \
 	posix/dirs.c \
+	posix/error.c \
 	posix/filesystem.c \
 	posix/netconf.c \
 	posix/thread.c \
@@ -401,6 +412,7 @@ SOURCES_libvlc_common = \
 	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 \
@@ -430,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 \
@@ -469,9 +482,11 @@ SOURCES_libvlc_common = \
 	misc/xml.c \
 	extras/libc.c \
 	extras/tdestroy.c \
+	misc/addons.c \
 	misc/filter.c \
 	misc/filter_chain.c \
 	misc/http_auth.c \
+	misc/httpcookies.c \
 	misc/fingerprinter.c \
 	misc/text_style.c \
 	misc/subpicture.c \
@@ -485,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)
@@ -507,6 +521,7 @@ check_PROGRAMS = \
 	test_dictionary \
 	test_i18n_atof \
 	test_md5 \
+	test_picture_pool \
 	test_timer \
 	test_url \
 	test_utf8 \
@@ -522,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