X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=e6b6b420db71a403253f59d6011a1f5637dcd71e;hb=f1ae515db278f898a8e298d24ea05e7d7e6f7eb9;hp=2e27160b9eeb5334c89d83b394b38afd5e373b73;hpb=63ea63eb19692b20fe489f25c237c121d36fe932;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 2e27160b9e..e6b6b420db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,7 @@ HEADERS_include = \ ../include/vlc_block_helper.h \ ../include/vlc_charset.h \ ../include/vlc_codec.h \ + ../include/vlc_codec_synchro.h \ ../include/vlc_codecs.h \ ../include/vlc_common.h \ ../include/vlc_config.h \ @@ -82,13 +83,12 @@ HEADERS_include = \ ../include/vlc_vlm.h \ ../include/vlc_vod.h \ ../include/vlc_vout.h \ - ../include/vlc_vout_synchro.h \ ../include/vlc_xml.h \ $(NULL) modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am rm -f -- "$@.tmp" - cat "$<" > "$@.tmp" + cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp" if !HAVE_PLUGINS plugins="$$($(VLC_CONFIG) --list plugin)" ; \ test -n "$${plugins}" && \ @@ -120,7 +120,7 @@ nice: lib_LTLIBRARIES = libvlc.la libvlc-control.la -AM_LDFLAGS = -no-undefined +AM_LDFLAGS = -no-undefined -no-install if HAVE_WIN32 AM_LDFLAGS += -avoid-version endif @@ -223,6 +223,7 @@ SOURCES_libvlc_common = \ input/clock.c \ input/control.c \ input/decoder.c \ + input/decoder_synchro.c \ input/demux.c \ input/es_out.c \ input/input.c \ @@ -239,7 +240,6 @@ SOURCES_libvlc_common = \ video_output/video_text.c \ video_output/video_widgets.c \ video_output/vout_subpictures.c \ - video_output/vout_synchro.c \ video_output/vout_intf.c \ audio_output/aout_internal.h \ audio_output/common.c \ @@ -325,7 +325,9 @@ SOURCES_libvlc_control = \ control/media_descriptor.c \ control/media_instance.c \ control/media_list.c \ + control/media_list_path.h \ control/media_list_player.c \ + control/media_list_view.c \ control/media_library.c \ control/mediacontrol_internal.h \ control/mediacontrol_core.c \