X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=2f81f6f9ee315be5c65cd16886b99b8a9c971d8e;hb=e66e185558bc2cd366f190fb498475b26e40e2db;hp=bbbe84852cfbee62ceb19a173f5372d6412cc056;hpb=e996cbefaf0f8db55513071b9678242e0a7733da;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index bbbe84852c..2f81f6f9ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,9 @@ pluginsinclude_HEADERS = \ ../include/vlc_access.h \ ../include/vlc_acl.h \ ../include/vlc_aout.h \ + ../include/vlc_aout_mixer.h \ ../include/vlc_arrays.h \ + ../include/vlc_art_finder.h \ ../include/vlc_avcodec.h \ ../include/vlc_bits.h \ ../include/vlc_block.h \ @@ -57,6 +59,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_config.h \ ../include/vlc_config_cat.h \ ../include/vlc_configuration.h \ + ../include/vlc_cpu.h \ ../include/vlc_dialog.h \ ../include/vlc_demux.h \ ../include/vlc_epg.h \ @@ -69,6 +72,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_http.h \ ../include/vlc_httpd.h \ ../include/vlc_image.h \ + ../include/vlc_inhibit.h \ ../include/vlc_input.h \ ../include/vlc_input_item.h \ ../include/vlc_main.h \ @@ -76,6 +80,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_messages.h \ ../include/vlc_meta.h \ ../include/vlc_modules.h \ + ../include/vlc_mouse.h \ ../include/vlc_mtime.h \ ../include/vlc_objects.h \ ../include/vlc_picture.h \ @@ -83,8 +88,10 @@ pluginsinclude_HEADERS = \ ../include/vlc_picture_pool.h \ ../include/vlc_playlist.h \ ../include/vlc_plugin.h \ + ../include/vlc_probe.h \ ../include/vlc_rand.h \ ../include/vlc_services_discovery.h \ + ../include/vlc_sql.h \ ../include/vlc_sout.h \ ../include/vlc_stream.h \ ../include/vlc_strings.h \ @@ -96,6 +103,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_video_splitter.h \ ../include/vlc_vout.h \ ../include/vlc_vout_display.h \ + ../include/vlc_vout_opengl.h \ ../include/vlc_vout_window.h \ ../include/vlc_xml.h \ $(NULL) @@ -104,18 +112,19 @@ noinst_HEADERS = \ ../include/mmx.h \ ../include/vlc_codec_synchro.h \ ../include/vlc_codecs.h \ - ../include/vlc_devices.h \ ../include/vlc_fixups.h \ ../include/vlc_interface.h \ ../include/vlc_intf_strings.h \ ../include/vlc_iso_lang.h \ ../include/vlc_keys.h \ + ../include/vlc_memory.h \ ../include/vlc_network.h \ ../include/vlc_osd.h \ ../include/vlc_pgpkey.h \ ../include/vlc_tls.h \ ../include/vlc_update.h \ ../include/vlc_vod.h \ + ../include/vlc_vout_wrapper.h \ $(NULL) ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS @@ -258,22 +267,26 @@ SOURCES_libvlc_beos = \ $(NULL) SOURCES_libvlc_darwin = \ + config/dirs_macos.c \ misc/pthread.c \ misc/darwin_specific.c \ $(NULL) SOURCES_libvlc_linux = \ + config/dirs_xdg.c \ misc/pthread.c \ misc/linux_specific.c \ $(NULL) SOURCES_libvlc_win32 = \ + config/dirs_win.c \ misc/w32thread.c \ misc/win32_specific.c \ network/winsock.c \ $(NULL) SOURCES_libvlc_other = \ + config/dirs_xdg.c \ misc/pthread.c \ misc/not_specific.c @@ -347,6 +360,9 @@ SOURCES_libvlc_common = \ input/var.c \ video_output/display.c \ video_output/display.h \ + video_output/event.h \ + video_output/inhibit.c \ + video_output/inhibit.h \ video_output/snapshot.c \ video_output/snapshot.h \ video_output/statistic.h \ @@ -387,11 +403,14 @@ SOURCES_libvlc_common = \ text/iso_lang.c \ text/iso-639_def.h \ misc/md5.c \ + misc/probe.c \ misc/rand.c \ misc/mtime.c \ misc/block.c \ misc/fourcc.c \ misc/es_format.c \ + misc/picture_fifo.c \ + misc/picture_pool.c \ modules/modules.h \ modules/modules.c \ modules/cache.c \ @@ -401,13 +420,15 @@ SOURCES_libvlc_common = \ misc/stats.c \ misc/cpu.c \ misc/action.c \ + misc/epg.c \ config/configuration.h \ config/core.c \ - config/dirs.c \ config/chain.c \ config/file.c \ config/intf.c \ + config/keys.c \ config/cmdline.c \ + config/dirs.c \ misc/events.c \ misc/image.c \ misc/messages.c \ @@ -417,12 +438,13 @@ SOURCES_libvlc_common = \ misc/error.c \ misc/update.h \ misc/update.c \ + misc/update_crypto.c \ misc/xml.c \ - misc/devices.c \ extras/libc.c \ misc/filter.c \ misc/filter_chain.c \ misc/http_auth.c \ + misc/sql.c \ $(NULL) SOURCES_libvlc_httpd = \ @@ -496,16 +518,19 @@ revision.c: revision.txt echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ > revision.c -revision.txt: +revision.txt: Makefile.am $(MAKE) stamp-revision touch revision.txt stamp-revision: rm -f -- revision.tmp (git --git-dir="$(top_srcdir)/.git/" describe --tags --long \ - --always || echo exported) > revision.tmp - diff revision.tmp revision.txt >/dev/null 2>&1 || \ - mv -f -- revision.tmp revision.txt + --match '?.*.*' --always || echo exported) > revision.tmp + if diff revision.tmp revision.txt >/dev/null; then \ + rm -f -- revision.tmp; \ + else \ + mv -f -- revision.tmp revision.txt; \ + fi 2>&1 ############################################################################### # Unit/regression test