X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=21a862868d9e0606345e53cfa1241ba6a60fbd59;hb=73dc6d3573b013776638bd8f13c51eb8ad84e335;hp=571ec0a1601d321e34af10d90f5a8972afbc5615;hpb=a76e38e103fb6e405b218c61ef475ca85223262e;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 571ec0a160..21a862868d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,6 @@ pkginclude_HEADERS = \ ../include/vlc/deprecated.h \ ../include/vlc/libvlc.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 \ @@ -93,6 +92,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 \ @@ -185,6 +185,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` @@ -408,6 +409,7 @@ SOURCES_libvlc_common = \ misc/xml.c \ misc/devices.c \ extras/libc.c \ + misc/filter.c \ misc/filter_chain.c \ $(NULL) @@ -478,7 +480,7 @@ CLEANFILES += revision.txt revision.c revision.c: revision.txt rm -f -- revision.c - echo -n "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ + echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ > revision.c revision.txt: @@ -487,7 +489,8 @@ revision.txt: stamp-revision: rm -f -- revision.tmp - git describe --tags --long --always > 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 @@ -498,6 +501,22 @@ stamp-revision: dist_check_SCRIPTS = check_symbols check_headers TESTS = check_symbols +check_DATA = libvlc-headers.sym libvlc-sorted.sym +CLEANFILES += $(check_DATA) + +libvlc-sorted.sym: libvlccore.sym + rm -f libvlc-sorted.sym + sort -fdu < "$(srcdir)/libvlccore.sym" > libvlc-sorted.sym + +libvlc-headers.sym: + rm -f libvlc-headers.sym + cat ${srcdir}/../include/vlc_*.h ${srcdir}/control/*.h | \ + sed -n -e 's/^[ ]*VLC_EXPORT[ ]*([^,]*,\([^,]*\),.*/\1/p' | \ + sed -e 's/[^a-zA-Z0-9_]*//' | \ + sort -fdu > libvlc-headers.sym + +.PHONY: libvlc-headers.sym + check-local: for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \ do \