Avoid dlclose() only when valgrind is running

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 85b1006cdff2d043ddf114dc0637cdf1464a0533..4ab1dceab25ba9dae4fac7743ae6d48637869cd8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = extras/COPYING modules/builtin.h.in \
        libvlc.sym \
        libvlccore.sym
 
-BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
+BUILT_SOURCES = modules/builtin.h ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc
@@ -22,7 +22,6 @@ SUFFIXES = .pc.in .pc
 # Headers
 ###############################################################################
 
-pkgincludedir = $(includedir)/vlc
 pluginsincludedir = $(pkgincludedir)/plugins
 
 pkginclude_HEADERS = \
@@ -61,6 +60,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_httpd.h \
        ../include/vlc_image.h \
        ../include/vlc_input.h \
+       ../include/vlc_input_item.h \
        ../include/vlc_main.h \
        ../include/vlc_md5.h \
        ../include/vlc_messages.h \
@@ -177,9 +177,9 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
-       -DDATA_PATH=\"$(pkgdatadir)\" \
+       -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(pkglibdir)\"
+       -DPLUGIN_PATH=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -export-symbols $(srcdir)/libvlccore.sym \
        -version-info 1:0:0
@@ -468,13 +468,21 @@ SOURCES_libvlc_control = \
 # Stamp rules
 ###############################################################################
 
+misc/revision.c.tmp:
+       rm -f -- $@
+       echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@
+       REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo "$(VERSION)")"; \
+       echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@
+       diff $@ misc/revision.c >/dev/null 2>&1 || \
+               cat misc/revision.c.tmp > misc/revision.c
+
 misc/revision.c:
-       rm -f -- $@ $@.tmp
-       echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-       REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo exported)"; \
-       echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
-       mv -f -- $@.tmp $@
+       $(MAKE) misc/revision.c.tmp
+       cat misc/revision.c.tmp > misc/revision.c
+
+BUILT_SOURCES += misc/revision.c.tmp misc/revision.c
 
+.PHONY: misc/revision.c.tmp
 
 ###############################################################################
 # Unit/regression test