Repair libvlc_get_changeset()

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a799c8cd2b91e353bb9ae4bfcae56d33da04f76..01b2a63d305ea8bcffa5841f374ccd51872f1032 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 \
@@ -58,6 +65,7 @@ pluginsinclude_HEADERS = \
        ../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 \
@@ -70,6 +78,9 @@ pluginsinclude_HEADERS = \
        ../include/vlc_modules.h \
        ../include/vlc_mtime.h \
        ../include/vlc_objects.h \
+       ../include/vlc_picture.h \
+       ../include/vlc_picture_fifo.h \
+       ../include/vlc_picture_pool.h \
        ../include/vlc_playlist.h \
        ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
@@ -77,6 +88,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 \
@@ -149,7 +161,8 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+nodist_libvlccore_la_SOURCES = revision.c
+libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -159,7 +172,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 2:0:0
+       -version-info 3:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
        $(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -172,12 +185,12 @@ 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)
+nodist_libvlc_la_SOURCES = revision.c
 libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
        libvlccore.la ../compat/libcompat.la
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-       -DMODULE_STRING=\"control\"
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
-       -version-info 4:0:2 \
+       -version-info 5:0:0 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
@@ -236,22 +249,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 \
@@ -360,6 +379,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 \
@@ -421,6 +441,11 @@ SOURCES_libvlc = \
 
 SOURCES_libvlc_control = \
        control/libvlc_internal.h \
+       control/event_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 \
@@ -428,6 +453,7 @@ SOURCES_libvlc_control = \
        control/video.c \
        control/audio.c \
        control/event.c \
+       control/event_async.c \
        control/flat_media_list_view.c \
        control/hierarchical_media_list_view.c \
        control/hierarchical_node_media_list_view.c \
@@ -444,6 +470,28 @@ SOURCES_libvlc_control = \
        control/mediacontrol_audio_video.c \
        control/media_discoverer.c
 
+###############################################################################
+# GIT revision
+###############################################################################
+
+BUILT_SOURCES += stamp-revision
+CLEANFILES += revision.txt revision.c
+
+revision.c: revision.txt
+       rm -f -- revision.c
+       echo -n "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
+               > revision.c
+
+revision.txt:
+       $(MAKE) stamp-revision
+       touch revision.txt
+
+stamp-revision:
+       rm -f -- revision.tmp
+       git describe --tags --long --always > revision.tmp
+       diff revision.tmp revision.txt >/dev/null 2>&1 || \
+       mv -f -- revision.tmp revision.txt
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################