X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=a34dda02cf81c516c0e89fee5d722cba2cb7d20c;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=638c7e4ed1f61943eac5a7693f05ce5f366652b1;hpb=b83f330408feb2dc6df1b63b28e42869daddbeda;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 638c7e4ed1..a34dda02cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,9 +11,12 @@ EXTRA_DIST = extras/COPYING \
 	libvlc.pc.in \
 	vlc-plugin.pc.in \
 	libvlc.sym \
-	libvlccore.sym
+	libvlccore.sym \
+	../include/vlc/libvlc_version.h.in
 
-BUILT_SOURCES = ../include/vlc_about.h
+BUILT_SOURCES = \
+	$(nodist_pkginclude_HEADERS) \
+	$(nodist_pluginsinclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc .rc.in .rc
@@ -38,6 +41,7 @@ pkginclude_HEADERS = \
 	../include/vlc/libvlc_structures.h \
 	../include/vlc/libvlc_vlm.h \
 	$(NULL)
+nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h
 
 pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
@@ -46,6 +50,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_aout_mixer.h \
 	../include/vlc_arrays.h \
 	../include/vlc_art_finder.h \
+	../include/vlc_atomic.h \
 	../include/vlc_avcodec.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
@@ -77,6 +82,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_md5.h \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
+	../include/vlc_media_library.h \
 	../include/vlc_modules.h \
 	../include/vlc_mouse.h \
 	../include/vlc_mtime.h \
@@ -109,6 +115,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_xml.h \
 	../include/vlc_xlib.h \
 	$(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
 	../include/vlc_codec_synchro.h \
@@ -130,6 +137,10 @@ noinst_HEADERS = \
 	../include/vlc_windows_interfaces.h \
 	$(NULL)
 
+../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
+	$(AM_V_GEN)cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="src/$@"
+
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
 	$(AM_V_at)rm -f -- "$@.tmp"
 	$(AM_V_at)mkdir -p -- ../include
@@ -142,7 +153,7 @@ noinst_HEADERS = \
 		"$(top_srcdir)/THANKS" && \
 	echo ";" && \
 	echo "static const char psz_authors[] =" && \
-	sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \
+	sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
 		"$(top_srcdir)/AUTHORS" && \
 	echo ";") >> "$@.tmp"
 	$(AM_V_at)mv -f -- "$@.tmp" "$@"
@@ -230,7 +241,6 @@ EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_linux) \
 	$(SOURCES_libvlc_win32) \
 	$(SOURCES_libvlc_other) \
-	$(SOURCES_libvlc_dirent) \
 	$(SOURCES_libvlc_httpd) \
 	$(SOURCES_libvlc_sout) \
 	$(SOURCES_libvlc_vlm) \
@@ -256,9 +266,6 @@ endif
 endif
 endif
 endif
-if BUILD_DIRENT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -270,17 +277,20 @@ endif
 endif
 
 SOURCES_libvlc_beos = \
+	misc/atomic.c \
 	misc/pthread.c \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
 	config/dirs_macos.c \
+	misc/atomic.c \
 	misc/pthread.c \
 	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
 	config/dirs_xdg.c \
+	misc/atomic.c \
 	misc/pthread.c \
 	misc/linux_specific.c \
 	$(NULL)
@@ -288,19 +298,17 @@ SOURCES_libvlc_linux = \
 SOURCES_libvlc_win32 = \
 	win32/dirs.c \
 	win32/specific.c \
+	win32/atomic.c \
 	win32/thread.c \
 	win32/winsock.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
 	config/dirs_xdg.c \
+	misc/atomic.c \
 	misc/pthread.c \
 	misc/not_specific.c
 
-SOURCES_libvlc_dirent = \
-	extras/dirent.c \
-	$(NULL)
-
 SOURCES_libvlc_common = \
 	libvlc.c \
 	libvlc.h \
@@ -452,6 +460,7 @@ SOURCES_libvlc_common = \
 	misc/update.c \
 	misc/update_crypto.c \
 	misc/xml.c \
+	misc/media_library.c \
 	extras/libc.c \
 	extras/tdestroy.c \
 	misc/filter.c \
@@ -486,7 +495,6 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_beos) \
 	$(OPT_SOURCES_libvlc_darwin) \
 	$(OPT_SOURCES_libvlc_win32) \
-	$(OPT_SOURCES_libvlc_dirent) \
 	$(NULL)
 
 SOURCES_libvlc_control = \