Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b05eb674778a3d0d27b6bcf7a47c485a04f13e5e..a34dda02cf81c516c0e89fee5d722cba2cb7d20c 100644 (file)
--- 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 \
@@ -111,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 \
@@ -132,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
@@ -144,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" "$@"
@@ -232,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) \
@@ -258,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
@@ -304,10 +309,6 @@ SOURCES_libvlc_other = \
        misc/pthread.c \
        misc/not_specific.c
 
-SOURCES_libvlc_dirent = \
-       extras/dirent.c \
-       $(NULL)
-
 SOURCES_libvlc_common = \
        libvlc.c \
        libvlc.h \
@@ -494,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 = \