The current libvlc-control ABI is not compatible with the 0.8.6 one. Change SONAME.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 79ffe3913964417f7b8462fbf70748af735d8cfb..2f83036f19f5aefec80e4b497f489084861c77fb 100644 (file)
--- 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 \
@@ -69,6 +70,7 @@ HEADERS_include = \
        ../include/vlc_osd.h \
        ../include/vlc_playlist.h \
        ../include/vlc_rand.h \
+       ../include/vlc_services_discovery.h \
        ../include/vlc_sout.h \
        ../include/vlc_stream.h \
        ../include/vlc_streaming.h \
@@ -82,13 +84,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 "modules/builtin.h.in" > "$@.tmp"
+       cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
 if !HAVE_PLUGINS
        plugins="$$($(VLC_CONFIG) --list plugin)" ; \
        test -n "$${plugins}" && \
@@ -120,31 +121,31 @@ 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
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_LIBADD = $(LTLIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_la_LDFLAGS += -export-dynamic
 else
 libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym 
 endif
+libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 
 libvlc_la_DEPENDENCIES = libvlc.sym
 
 libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_control_la_LIBADD = libvlc.la
 libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
-libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
+libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_control_la_LDFLAGS += -export-dynamic
 else
@@ -223,6 +224,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 +241,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 \
@@ -321,11 +322,13 @@ SOURCES_libvlc_control = \
        control/audio.c \
        control/dynamic_media_list.c \
        control/event.c \
-       control/flat_media_list.c \
+       control/flat_media_list_view.c \
        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 \