Avoid dlclose() only when valgrind is running

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 058f4039f2647952e4f905a0ce95a1d58ceffa9c..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 \
@@ -167,6 +167,9 @@ AM_LDFLAGS = -no-undefined
 if HAVE_WIN32
 AM_LDFLAGS += -avoid-version
 endif
+if HAVE_WINCE
+AM_LDFLAGS += -avoid-version
+endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlccore_la_SOURCES = misc/revision.c
@@ -174,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
@@ -212,6 +215,7 @@ EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
+       $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
        $(SOURCES_libvlc_vlm) \
        $(NULL)
@@ -242,6 +246,9 @@ endif
 if BUILD_GETOPT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
+if BUILD_HTTPD
+libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
+endif
 if ENABLE_SOUT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
 if ENABLE_VLM
@@ -281,17 +288,24 @@ SOURCES_libvlc_common = \
        libvlc.c \
        libvlc.h \
        libvlc-module.c \
+       missing.c \
        version.c \
        interface/interface.h \
        interface/interface.c \
        interface/intf_eject.c \
        interface/interaction.c \
        playlist/playlist_internal.h \
+       playlist/art.c \
+       playlist/art.h \
        playlist/thread.c \
        playlist/control.c \
        playlist/engine.c \
+       playlist/fetcher.c \
+       playlist/fetcher.h \
        playlist/sort.c \
        playlist/loadsave.c \
+       playlist/preparser.c \
+       playlist/preparser.h \
        playlist/tree.c \
        playlist/item.c \
        playlist/search.c \
@@ -304,16 +318,28 @@ SOURCES_libvlc_common = \
        input/decoder_synchro.c \
        input/demux.c \
        input/es_out.c \
+       input/es_out_timeshift.c \
+       input/event.c \
        input/input.c \
        input/meta.c \
+       input/access.h \
        input/clock.h \
        input/decoder.h \
        input/demux.h \
        input/es_out.h \
+       input/es_out_timeshift.h \
+       input/event.h \
+       input/item.h \
+       input/stream.h \
        input/input_internal.h \
+       input/input_interface.h \
        input/vlm_internal.h \
+       input/ressource.h \
+       input/ressource.c \
        input/stream.c \
-       input/mem_stream.c \
+       input/stream_demux.c \
+       input/stream_filter.c \
+       input/stream_memory.c \
        input/subtitles.c \
        input/var.c \
        video_output/video_output.c \
@@ -324,6 +350,7 @@ SOURCES_libvlc_common = \
        video_output/vout_subpictures.c \
        video_output/vout_intf.c \
        video_output/vout_internal.h \
+       video_output/vout_control.h \
        audio_output/aout_internal.h \
        audio_output/common.c \
        audio_output/dec.c \
@@ -340,13 +367,13 @@ SOURCES_libvlc_common = \
        network/io.c \
        network/tcp.c \
        network/udp.c \
-       network/httpd.c \
        network/rootbind.c \
        network/tls.c \
        network/poll.c \
        text/charset.c \
        text/strings.c \
        text/unicode.c \
+       text/filesystem.c \
        text/wincp.c \
        text/iso_lang.c \
        text/iso-639_def.h \
@@ -386,6 +413,10 @@ SOURCES_libvlc_common = \
        misc/filter_chain.c \
        $(NULL)
 
+SOURCES_libvlc_httpd = \
+       network/httpd.c \
+       $(NULL)
+
 SOURCES_libvlc_sout = \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
@@ -437,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