X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=edc4dbe90c1182abdf275078b68d25e72c861e77;hb=444f32586f6ef937dc8dd66809189fe3fa838f82;hp=c265d6d622faf4c87a5d02f3179320110a645ddf;hpb=b3a59c07e71c74191c2d1524dbd2f5412dd762db;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index c265d6d622..edc4dbe90c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,13 +7,15 @@ SUBDIRS = . test NULL = EXTRA_DIST = extras/COPYING \ - misc/beos_specific.cpp \ libvlc.pc.in \ vlc-plugin.pc.in \ libvlc.sym \ - libvlccore.sym + libvlccore.sym \ + ../include/vlc/libvlc_version.h.in -BUILT_SOURCES = ../include/vlc_about.h +BUILT_SOURCES = \ + $(nodist_pkginclude_HEADERS) \ + $(nodist_pluginsinclude_HEADERS) CLEANFILES = $(BUILT_SOURCES) SUFFIXES = .pc.in .pc .rc.in .rc @@ -38,6 +40,7 @@ pkginclude_HEADERS = \ ../include/vlc/libvlc_structures.h \ ../include/vlc/libvlc_vlm.h \ $(NULL) +nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h pluginsinclude_HEADERS = \ ../include/vlc_access.h \ @@ -46,6 +49,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 +81,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 +96,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,9 +109,12 @@ 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) +nodist_pluginsinclude_HEADERS = ../include/vlc_about.h noinst_HEADERS = \ ../include/vlc_codec_synchro.h \ @@ -123,8 +133,13 @@ noinst_HEADERS = \ ../include/vlc_update.h \ ../include/vlc_vod.h \ ../include/vlc_vout_wrapper.h \ + ../include/vlc_windows_interfaces.h \ $(NULL) +../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status + $(AM_V_GEN)cd "$(top_builddir)" && \ + $(SHELL) ./config.status --file="src/$@" + ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS $(AM_V_at)rm -f -- "$@.tmp" $(AM_V_at)mkdir -p -- ../include @@ -137,7 +152,7 @@ noinst_HEADERS = \ "$(top_srcdir)/THANKS" && \ echo ";" && \ echo "static const char psz_authors[] =" && \ - sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \ + sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \ "$(top_srcdir)/AUTHORS" && \ echo ";") >> "$@.tmp" $(AM_V_at)mv -f -- "$@.tmp" "$@" @@ -188,13 +203,11 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \ -DLOCALEDIR=\"$(localedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DDATA_PATH=\"$(vlcdatadir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DPKGLIBDIR=\"$(vlclibdir)\" \ - -DPLUGIN_PATH=PKGLIBDIR\"/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 @@ -212,7 +225,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 @@ -222,19 +235,14 @@ endif EXTRA_libvlccore_la_SOURCES = \ - $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_linux) \ $(SOURCES_libvlc_win32) \ $(SOURCES_libvlc_other) \ - $(SOURCES_libvlc_dirent) \ $(SOURCES_libvlc_httpd) \ $(SOURCES_libvlc_sout) \ $(SOURCES_libvlc_vlm) \ $(NULL) -if HAVE_BEOS -libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) -else if HAVE_DARWIN libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin) else @@ -252,10 +260,6 @@ endif endif endif endif -endif -if BUILD_DIRENT -libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent) -endif if BUILD_HTTPD libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd) endif @@ -266,18 +270,18 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm) endif endif -SOURCES_libvlc_beos = \ - misc/pthread.c \ - $(NULL) - SOURCES_libvlc_darwin = \ config/dirs_macos.c \ + misc/atomic.c \ + misc/filesystem.c \ misc/pthread.c \ misc/darwin_specific.c \ $(NULL) SOURCES_libvlc_linux = \ config/dirs_xdg.c \ + misc/atomic.c \ + misc/filesystem.c \ misc/pthread.c \ misc/linux_specific.c \ $(NULL) @@ -285,19 +289,19 @@ SOURCES_libvlc_linux = \ SOURCES_libvlc_win32 = \ win32/dirs.c \ win32/specific.c \ + win32/atomic.c \ + win32/filesystem.c \ win32/thread.c \ win32/winsock.c \ $(NULL) SOURCES_libvlc_other = \ config/dirs_xdg.c \ + misc/atomic.c \ + misc/filesystem.c \ misc/pthread.c \ misc/not_specific.c -SOURCES_libvlc_dirent = \ - extras/dirent.c \ - $(NULL) - SOURCES_libvlc_common = \ libvlc.c \ libvlc.h \ @@ -357,17 +361,22 @@ 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 \ @@ -376,6 +385,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 \ @@ -386,7 +396,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 \ @@ -408,6 +417,7 @@ SOURCES_libvlc_common = \ misc/block.c \ misc/fourcc.c \ misc/es_format.c \ + misc/picture.c \ misc/picture_fifo.c \ misc/picture_pool.c \ modules/modules.h \ @@ -421,6 +431,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 \ @@ -429,6 +440,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 \ @@ -440,15 +453,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 \ - extras/getopt.c \ - extras/getopt.h \ - extras/getopt1.c \ + misc/text_style.c \ + misc/subpicture.c \ + misc/subpicture.h \ $(NULL) SOURCES_libvlc_httpd = \ @@ -471,10 +485,8 @@ SOURCES_libvlc_vlm = \ SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ - $(OPT_SOURCES_libvlc_beos) \ $(OPT_SOURCES_libvlc_darwin) \ $(OPT_SOURCES_libvlc_win32) \ - $(OPT_SOURCES_libvlc_dirent) \ $(NULL) SOURCES_libvlc_control = \