X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=842fc732db21e6b61e391ee1cd9eeb14368b9b60;hb=d0ef4bd7e83ecdede9287524c7f44ac75fbe839d;hp=9ac25d35fb8cb1cdfc10d826e809ad1994cf459d;hpb=5282cbf1d8454ae80b6630300c8778d2ff99d38d;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ac25d35fb..842fc732db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,8 +23,8 @@ 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 \
@@ -77,7 +77,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 \
@@ -108,7 +108,6 @@ noinst_HEADERS = \
 	../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 7:0:0
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
 	../compat/libcompat.la \
 	$(LTLIBINTL) $(LTLIBICONV) \
@@ -204,6 +201,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 +213,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 +234,7 @@ endif
 endif
 endif
 endif
+endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -244,18 +246,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,7 +287,9 @@ SOURCES_libvlc_linux = \
 
 SOURCES_libvlc_win32 = \
 	win32/dirs.c \
+	win32/error.c \
 	win32/filesystem.c \
+	win32/netconf.c \
 	win32/plugin.c \
 	win32/thread.c \
 	win32/specific.c \
@@ -285,7 +307,9 @@ SOURCES_libvlc_symbian = \
 SOURCES_libvlc_os2 = \
 	os2/getaddrinfo.c \
 	os2/dirs.c \
+	darwin/error.c \
 	os2/filesystem.c \
+	os2/netconf.c \
 	os2/plugin.c \
 	os2/thread.c \
 	os2/specific.c \
@@ -294,7 +318,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 \
@@ -314,6 +340,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 \
@@ -375,8 +402,6 @@ 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 \
@@ -392,12 +417,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 \
@@ -453,13 +474,13 @@ 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/fingerprinter.c \
 	misc/text_style.c \
 	misc/subpicture.c \
 	misc/subpicture.h \