X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=b05eb674778a3d0d27b6bcf7a47c485a04f13e5e;hb=7f48382793df3f420d48d63940ad92cbf7dcf447;hp=8468da07b2693fb4acb23f06e4393f29bcf3930e;hpb=c7eabcd9174667cfd57430f0220407bb5d806f98;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 8468da07b2..b05eb67477 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,6 +46,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_aout_mixer.h \
 	../include/vlc_arrays.h \
 	../include/vlc_art_finder.h \
+	../include/vlc_atomic.h \
 	../include/vlc_avcodec.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
@@ -77,6 +78,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_md5.h \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
+	../include/vlc_media_library.h \
 	../include/vlc_modules.h \
 	../include/vlc_mouse.h \
 	../include/vlc_mtime.h \
@@ -91,9 +93,11 @@ pluginsinclude_HEADERS = \
 	../include/vlc_services_discovery.h \
 	../include/vlc_sql.h \
 	../include/vlc_sout.h \
+	../include/vlc_spu.h \
 	../include/vlc_stream.h \
 	../include/vlc_strings.h \
 	../include/vlc_subpicture.h \
+	../include/vlc_text_style.h \
 	../include/vlc_threads.h \
 	../include/vlc_url.h \
 	../include/vlc_variables.h \
@@ -102,8 +106,10 @@ pluginsinclude_HEADERS = \
 	../include/vlc_vout.h \
 	../include/vlc_vout_display.h \
 	../include/vlc_vout_opengl.h \
+	../include/vlc_vout_osd.h \
 	../include/vlc_vout_window.h \
 	../include/vlc_xml.h \
+	../include/vlc_xlib.h \
 	$(NULL)
 
 noinst_HEADERS = \
@@ -123,6 +129,7 @@ noinst_HEADERS = \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
 	../include/vlc_vout_wrapper.h \
+	../include/vlc_windows_interfaces.h \
 	$(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
@@ -171,9 +178,6 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 # Building libvlc
 ###############################################################################
 
-nice:
-	$(top_builddir)/compile
-
 lib_LTLIBRARIES = libvlccore.la libvlc.la
 
 AM_LDFLAGS = -no-undefined
@@ -191,12 +195,11 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(vlcdatadir)\" \
-	-DLIBDIR=\"$(libdir)\" \
-	-DPLUGIN_PATH=\"$(vlclibdir)/modules\"
+	-DPKGLIBDIR=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 4:0:0
+	-version-info 5:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
 	$(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -214,7 +217,7 @@ libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
 	libvlccore.la ../compat/libcompat.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
-	-version-info 5:0:0 \
+	-version-info 6:0:1 \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
@@ -230,7 +233,6 @@ EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_win32) \
 	$(SOURCES_libvlc_other) \
 	$(SOURCES_libvlc_dirent) \
-	$(SOURCES_libvlc_getopt) \
 	$(SOURCES_libvlc_httpd) \
 	$(SOURCES_libvlc_sout) \
 	$(SOURCES_libvlc_vlm) \
@@ -259,9 +261,6 @@ endif
 if BUILD_DIRENT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
 endif
-if BUILD_GETOPT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -273,17 +272,20 @@ endif
 endif
 
 SOURCES_libvlc_beos = \
+	misc/atomic.c \
 	misc/pthread.c \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
 	config/dirs_macos.c \
+	misc/atomic.c \
 	misc/pthread.c \
 	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
 	config/dirs_xdg.c \
+	misc/atomic.c \
 	misc/pthread.c \
 	misc/linux_specific.c \
 	$(NULL)
@@ -291,12 +293,14 @@ SOURCES_libvlc_linux = \
 SOURCES_libvlc_win32 = \
 	win32/dirs.c \
 	win32/specific.c \
+	win32/atomic.c \
 	win32/thread.c \
 	win32/winsock.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
 	config/dirs_xdg.c \
+	misc/atomic.c \
 	misc/pthread.c \
 	misc/not_specific.c
 
@@ -304,12 +308,6 @@ SOURCES_libvlc_dirent = \
 	extras/dirent.c \
 	$(NULL)
 
-SOURCES_libvlc_getopt = \
-	extras/getopt.c \
-	extras/getopt.h \
-	extras/getopt1.c \
-	$(NULL)
-
 SOURCES_libvlc_common = \
 	libvlc.c \
 	libvlc.h \
@@ -346,6 +344,7 @@ SOURCES_libvlc_common = \
 	input/es_out_timeshift.c \
 	input/event.c \
 	input/input.c \
+	input/info.h \
 	input/meta.c \
 	input/access.h \
 	input/clock.h \
@@ -368,17 +367,23 @@ SOURCES_libvlc_common = \
 	input/stream_memory.c \
 	input/subtitles.c \
 	input/var.c \
+	video_output/chrono.h \
+	video_output/control.c \
+	video_output/control.h \
 	video_output/display.c \
 	video_output/display.h \
 	video_output/event.h \
 	video_output/inhibit.c \
 	video_output/inhibit.h \
+	video_output/interlacing.c \
+	video_output/interlacing.h \
 	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/vout_pictures.c \
-	video_output/vout_pictures.h \
 	video_output/video_text.c \
 	video_output/video_epg.c \
 	video_output/video_widgets.c \
@@ -387,6 +392,7 @@ SOURCES_libvlc_common = \
 	video_output/vout_intf.c \
 	video_output/vout_internal.h \
 	video_output/vout_control.h \
+	video_output/vout_wrapper.c \
 	audio_output/aout_internal.h \
 	audio_output/common.c \
 	audio_output/dec.c \
@@ -397,7 +403,6 @@ SOURCES_libvlc_common = \
 	audio_output/intf.c \
 	osd/osd.c \
 	osd/osd_text.c \
-	osd/osd_widgets.c \
 	network/acl.c \
 	network/getaddrinfo.c \
 	network/io.c \
@@ -432,6 +437,7 @@ SOURCES_libvlc_common = \
 	misc/cpu.c \
 	misc/action.c \
 	misc/epg.c \
+	misc/exit.c \
 	config/configuration.h \
 	config/core.c \
 	config/chain.c \
@@ -440,6 +446,8 @@ SOURCES_libvlc_common = \
 	config/keys.c \
 	config/cmdline.c \
 	config/dirs.c \
+	config/getopt.c \
+	config/vlc_getopt.h \
 	misc/events.c \
 	misc/image.c \
 	misc/messages.c \
@@ -451,12 +459,16 @@ SOURCES_libvlc_common = \
 	misc/update.c \
 	misc/update_crypto.c \
 	misc/xml.c \
+	misc/media_library.c \
 	extras/libc.c \
 	extras/tdestroy.c \
 	misc/filter.c \
 	misc/filter_chain.c \
 	misc/http_auth.c \
 	misc/sql.c \
+	misc/text_style.c \
+	misc/subpicture.c \
+	misc/subpicture.h \
 	$(NULL)
 
 SOURCES_libvlc_httpd = \
@@ -483,7 +495,6 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_darwin) \
 	$(OPT_SOURCES_libvlc_win32) \
 	$(OPT_SOURCES_libvlc_dirent) \
-	$(OPT_SOURCES_libvlc_getopt) \
 	$(NULL)
 
 SOURCES_libvlc_control = \