X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=2d922baa891bfb2deb28fc2a8a121cb596784643;hb=817e17cb7856d59cd82d55af68714be0b7a38694;hp=01b2a63d305ea8bcffa5841f374ccd51872f1032;hpb=3e43a6a6ad94874b4a9d550ed5e439c735d923fa;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 01b2a63d30..2d922baa89 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 \
@@ -47,7 +46,9 @@ pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
 	../include/vlc_acl.h \
 	../include/vlc_aout.h \
+	../include/vlc_aout_mixer.h \
 	../include/vlc_arrays.h \
+	../include/vlc_art_finder.h \
 	../include/vlc_avcodec.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
@@ -67,6 +68,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_filter.h \
 	../include/vlc_fourcc.h \
 	../include/vlc_gcrypt.h \
+	../include/vlc_http.h \
 	../include/vlc_httpd.h \
 	../include/vlc_image.h \
 	../include/vlc_input.h \
@@ -76,6 +78,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
 	../include/vlc_modules.h \
+	../include/vlc_mouse.h \
 	../include/vlc_mtime.h \
 	../include/vlc_objects.h \
 	../include/vlc_picture.h \
@@ -93,8 +96,10 @@ 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_vout_display.h \
+	../include/vlc_vout_window.h \
 	../include/vlc_xml.h \
 	$(NULL)
 
@@ -114,6 +119,7 @@ noinst_HEADERS = \
 	../include/vlc_tls.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
+	../include/vlc_vout_wrapper.h \
 	$(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
@@ -121,14 +127,17 @@ noinst_HEADERS = \
 	mkdir -p -- ../include
 	echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp"
 	echo "static const char psz_license[] =" >> "$@.tmp"
-	cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+	sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" >> "$@.tmp"
 	echo ";" >> "$@.tmp"
 	echo "static const char psz_thanks[] =" >> "$@.tmp"
-	grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
+	sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
+		"$(top_srcdir)/THANKS" >> "$@.tmp"
 	echo ";" >> "$@.tmp"
 	echo "static const char psz_authors[] =" >> "$@.tmp"
-	grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+	sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \
+		"$(top_srcdir)/AUTHORS" >> "$@.tmp"
 	echo ";" >> "$@.tmp"
+
 	mv -f -- "$@.tmp" "$@"
 
 ###############################################################################
@@ -172,7 +181,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 3:0:0
+	-version-info 4:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
 	$(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -253,22 +262,26 @@ SOURCES_libvlc_beos = \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
+	config/dirs_macos.c \
 	misc/pthread.c \
 	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
+	config/dirs_xdg.c \
 	misc/pthread.c \
 	misc/linux_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
+	config/dirs_win.c \
 	misc/w32thread.c \
 	misc/win32_specific.c \
 	network/winsock.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
+	config/dirs_xdg.c \
 	misc/pthread.c \
 	misc/not_specific.c
 
@@ -340,12 +353,19 @@ SOURCES_libvlc_common = \
 	input/stream_memory.c \
 	input/subtitles.c \
 	input/var.c \
+	video_output/display.c \
+	video_output/display.h \
+	video_output/event.h \
+	video_output/snapshot.c \
+	video_output/snapshot.h \
+	video_output/statistic.h \
 	video_output/video_output.c \
 	video_output/vout_pictures.c \
 	video_output/vout_pictures.h \
 	video_output/video_text.c \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
+	video_output/window.c \
 	video_output/vout_intf.c \
 	video_output/vout_internal.h \
 	video_output/vout_control.h \
@@ -392,7 +412,6 @@ SOURCES_libvlc_common = \
 	misc/action.c \
 	config/configuration.h \
 	config/core.c \
-	config/dirs.c \
 	config/chain.c \
 	config/file.c \
 	config/intf.c \
@@ -406,10 +425,13 @@ SOURCES_libvlc_common = \
 	misc/error.c \
 	misc/update.h \
 	misc/update.c \
+	misc/update_crypto.c \
 	misc/xml.c \
 	misc/devices.c \
 	extras/libc.c \
+	misc/filter.c \
 	misc/filter_chain.c \
+	misc/http_auth.c \
 	$(NULL)
 
 SOURCES_libvlc_httpd = \
@@ -447,6 +469,7 @@ SOURCES_libvlc_control = \
 	control/media_list_view_internal.h \
 	control/media_player_internal.h \
 	control/core.c \
+	control/error.c \
 	control/log.c \
 	control/playlist.c \
 	control/vlm.c \
@@ -479,7 +502,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:
@@ -488,7 +511,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
 
@@ -499,6 +523,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 \