isrc/Makefile.am: Include media_list_path.h to fix make dist-clean, as requested...

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d7ec8711d8fc1a1f62852052a24e311116857329..f5e5242544fefad6aac24a1ccd7a0ba93cc0f1d1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 BUILT_SOURCES = modules/builtin.h misc/revision.c
 CLEANFILES = $(BUILT_SOURCES)
 
-TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
-
 ###############################################################################
 # Headers
 ###############################################################################
@@ -32,63 +30,84 @@ HEADERS_include = \
        ../include/iso_lang.h \
        ../include/main.h \
        ../include/mmx.h \
-       ../include/vlc_modules.h \
-       ../include/vlc_modules_macros.h \
-       ../include/vlc_os_specific.h \
-       ../include/vlc_mtime.h \
-       ../include/vlc_network.h \
-       ../include/vlc_codecs.h \
-       ../include/vlc_configuration.h \
-       ../include/vlc_charset.h \
-       ../include/vlc_sout.h \
-       ../include/vlc_streaming.h \
-       ../include/vlc_variables.h \
-       ../include/vlc_aout.h \
        ../include/vlc_access.h \
-       ../include/vlc_arrays.h \
        ../include/vlc_acl.h \
+       ../include/vlc_aout.h \
+       ../include/vlc_arrays.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
        ../include/vlc_block_helper.h \
+       ../include/vlc_charset.h \
        ../include/vlc_codec.h \
+       ../include/vlc_codecs.h \
        ../include/vlc_common.h \
        ../include/vlc_config.h \
+       ../include/vlc_config_cat.h \
+       ../include/vlc_configuration.h \
        ../include/vlc_demux.h \
+       ../include/vlc_devices.h \
+       ../include/vlc_epg.h \
        ../include/vlc_es.h \
        ../include/vlc_es_out.h \
-       ../include/vlc_epg.h \
+       ../include/vlc_events.h \
        ../include/vlc_filter.h \
-       ../include/vlc_config_cat.h \
        ../include/vlc_httpd.h \
-       ../include/vlc_tls.h \
-       ../include/vlc_md5.h \
-       ../include/vlc_devices.h \
        ../include/vlc_image.h \
        ../include/vlc_input.h \
        ../include/vlc_interface.h \
        ../include/vlc_intf_strings.h \
        ../include/vlc_keys.h \
+       ../include/vlc_md5.h \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
+       ../include/vlc_modules.h \
+       ../include/vlc_modules_macros.h \
+       ../include/vlc_mtime.h \
+       ../include/vlc_network.h \
        ../include/vlc_objects.h \
+       ../include/vlc_os_specific.h \
        ../include/vlc_osd.h \
        ../include/vlc_playlist.h \
+       ../include/vlc_rand.h \
+       ../include/vlc_sout.h \
        ../include/vlc_stream.h \
+       ../include/vlc_streaming.h \
        ../include/vlc_strings.h \
-       ../include/vlc_threads_funcs.h \
        ../include/vlc_threads.h \
+       ../include/vlc_threads_funcs.h \
+       ../include/vlc_tls.h \
        ../include/vlc_update.h \
        ../include/vlc_url.h \
-       ../include/vlc_vout.h \
+       ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
        ../include/vlc_vod.h \
-       ../include/vlc_xml.h \
+       ../include/vlc_vout.h \
        ../include/vlc_vout_synchro.h \
+       ../include/vlc_xml.h \
        $(NULL)
 
-modules/builtin.h: modules/builtin.h.in
-       $(TOOLBOX) --update-includes
-       touch $@
+modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
+       rm -f -- "$@.tmp"
+       cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
+if !HAVE_PLUGINS
+       plugins="$$($(VLC_CONFIG) --list plugin)" ; \
+       test -n "$${plugins}" && \
+       for p in $${plugins}; do \
+               echo "int vlc_entry__$$p (module_t *);" ; \
+       done >> "$@.tmp"
+endif
+       echo "#define ALLOCATE_ALL_BUILTINS() \\" >> "$@.tmp"
+       echo "    do \\" >> "$@.tmp"
+       echo "    { \\" >> "$@.tmp"
+if !HAVE_PLUGINS
+       plugins="$$($(VLC_CONFIG) --list plugin)" ; \
+       test -n "$${plugins}" && \
+       for p in $${plugins}; do \
+               echo "        ALLOCATE_BUILTIN($$p); \\" ; \
+       done >> "$@.tmp"
+endif
+       echo '    } while( 0 );' >> "$@.tmp"
+       mv -f -- "$@.tmp" "$@"
 
 modules/modules.c: modules/builtin.h
 
@@ -96,6 +115,9 @@ modules/modules.c: modules/builtin.h
 # Building libvlc
 ###############################################################################
 
+nice:
+       $(top_builddir)/compile
+
 lib_LTLIBRARIES = libvlc.la libvlc-control.la
 
 AM_LDFLAGS = -no-undefined
@@ -109,7 +131,7 @@ libvlc_la_LIBADD = $(LTLIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --libs libvlc` \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \
        -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_la_LDFLAGS += -export-dynamic
@@ -254,6 +276,7 @@ SOURCES_libvlc_common = \
        text/iso_lang.c \
        text/iso-639_def.h \
        misc/md5.c \
+       misc/rand.c \
        misc/mtime.c \
        misc/block.c \
        modules/modules.h \
@@ -265,6 +288,7 @@ SOURCES_libvlc_common = \
        modules/configuration.h \
        modules/configuration.c \
        modules/configuration_chain.c \
+       misc/events.c \
        misc/image.c \
        misc/messages.c \
        misc/objects.c \
@@ -295,15 +319,20 @@ SOURCES_libvlc_control = \
        control/vlm.c \
        control/video.c \
        control/audio.c \
+       control/dynamic_media_list.c \
        control/event.c \
+       control/flat_media_list.c \
        control/media_descriptor.c \
        control/media_instance.c \
        control/media_list.c \
+       control/media_list_path.h \
        control/media_list_player.c \
+       control/media_library.c \
        control/mediacontrol_internal.h \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \
+       control/media_discoverer.c \
        control/tag_query.c
 
 ###############################################################################