Merge branch '1.0'

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 061e247a58e6ad7e4a8745a4c857f227c1741b82..290ff2c4c32f92a9b90b91808cfedff3b9c74997 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,9 +28,16 @@ pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
        ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
-       ../include/vlc/libvlc_structures.h \
-       ../include/vlc/libvlc_media_list.h \
        ../include/vlc/libvlc_events.h \
+       ../include/vlc/libvlc_media_list.h \
+       ../include/vlc/libvlc_media.h \
+       ../include/vlc/libvlc_media_discoverer.h \
+       ../include/vlc/libvlc_media_library.h \
+       ../include/vlc/libvlc_media_list.h \
+       ../include/vlc/libvlc_media_list_player.h \
+       ../include/vlc/libvlc_media_list_view.h \
+       ../include/vlc/libvlc_media_player.h \
+       ../include/vlc/libvlc_structures.h \
        ../include/vlc/libvlc_vlm.h \
        ../include/vlc/mediacontrol.h \
        ../include/vlc/mediacontrol_structures.h \
@@ -41,6 +48,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_acl.h \
        ../include/vlc_aout.h \
        ../include/vlc_arrays.h \
+       ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
        ../include/vlc_block_helper.h \
@@ -50,12 +58,14 @@ pluginsinclude_HEADERS = \
        ../include/vlc_config.h \
        ../include/vlc_config_cat.h \
        ../include/vlc_configuration.h \
+       ../include/vlc_dialog.h \
        ../include/vlc_demux.h \
        ../include/vlc_epg.h \
        ../include/vlc_es.h \
        ../include/vlc_es_out.h \
        ../include/vlc_events.h \
        ../include/vlc_filter.h \
+       ../include/vlc_fourcc.h \
        ../include/vlc_gcrypt.h \
        ../include/vlc_httpd.h \
        ../include/vlc_image.h \
@@ -68,6 +78,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_modules.h \
        ../include/vlc_mtime.h \
        ../include/vlc_objects.h \
+       ../include/vlc_picture.h \
        ../include/vlc_playlist.h \
        ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
@@ -75,6 +86,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_sout.h \
        ../include/vlc_stream.h \
        ../include/vlc_strings.h \
+       ../include/vlc_subpicture.h \
        ../include/vlc_threads.h \
        ../include/vlc_url.h \
        ../include/vlc_variables.h \
@@ -147,17 +159,19 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DPLUGIN_PATH=\"$(vlclibdir)\"
-libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+       -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 2:0:0
-libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
+       -version-info 3:0:0
+libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
+       $(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
@@ -168,11 +182,11 @@ libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_la_LIBADD = libvlccore.la
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-       -DMODULE_STRING=\"control\"
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
-       -version-info 4:0:2 \
+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 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
@@ -231,22 +245,28 @@ endif
 endif
 
 SOURCES_libvlc_beos = \
+       misc/pthread.c \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
+       misc/pthread.c \
        misc/darwin_specific.c \
        $(NULL)
 
 SOURCES_libvlc_linux = \
+       misc/pthread.c \
        misc/linux_specific.c \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
+       misc/w32thread.c \
        misc/win32_specific.c \
        network/winsock.c \
        $(NULL)
 
-SOURCES_libvlc_other = misc/not_specific.c
+SOURCES_libvlc_other = \
+       misc/pthread.c \
+       misc/not_specific.c
 
 SOURCES_libvlc_dirent = \
        extras/dirent.c \
@@ -264,10 +284,9 @@ SOURCES_libvlc_common = \
        libvlc-module.c \
        missing.c \
        version.c \
-       interface/interface.h \
+       interface/dialog.c \
        interface/interface.c \
        interface/intf_eject.c \
-       interface/interaction.c \
        playlist/playlist_internal.h \
        playlist/art.c \
        playlist/art.h \
@@ -308,8 +327,9 @@ SOURCES_libvlc_common = \
        input/input_internal.h \
        input/input_interface.h \
        input/vlm_internal.h \
-       input/ressource.h \
-       input/ressource.c \
+       input/vlm_event.h \
+       input/resource.h \
+       input/resource.c \
        input/stream.c \
        input/stream_demux.c \
        input/stream_filter.c \
@@ -355,6 +375,7 @@ SOURCES_libvlc_common = \
        misc/rand.c \
        misc/mtime.c \
        misc/block.c \
+       misc/fourcc.c \
        misc/es_format.c \
        modules/modules.h \
        modules/modules.c \
@@ -401,6 +422,7 @@ SOURCES_libvlc_sout = \
 
 SOURCES_libvlc_vlm = \
        input/vlm.c \
+       input/vlm_event.c \
        input/vlmshell.c \
        $(NULL)
 
@@ -415,6 +437,10 @@ SOURCES_libvlc = \
 
 SOURCES_libvlc_control = \
        control/libvlc_internal.h \
+       control/media_internal.h \
+       control/media_list_internal.h \
+       control/media_list_view_internal.h \
+       control/media_player_internal.h \
        control/core.c \
        control/log.c \
        control/playlist.c \