block_heap_Alloc(): create a block from an existing heap allocation

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 84f380aec2b6a03278dc0e910182792c5e0fcd9e..449bcdc3ee71a5965b6bdc7b10e6b0809e25b168 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,6 +93,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_url.h \
        ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
+       ../include/vlc_video_splitter.h \
        ../include/vlc_vout.h \
        ../include/vlc_window.h \
        ../include/vlc_xml.h \
@@ -161,6 +162,7 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
+nodist_libvlccore_la_SOURCES = revision.c
 libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
@@ -184,6 +186,7 @@ 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`
@@ -407,6 +410,7 @@ SOURCES_libvlc_common = \
        misc/xml.c \
        misc/devices.c \
        extras/libc.c \
+       misc/filter.c \
        misc/filter_chain.c \
        $(NULL)
 
@@ -468,6 +472,29 @@ 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 "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 --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
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################