X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=e6b6b420db71a403253f59d6011a1f5637dcd71e;hb=f1ae515db278f898a8e298d24ea05e7d7e6f7eb9;hp=acfe95d923a7cba55a9048f7242ae43ec89a3de9;hpb=7c3759c3555bd5bda7b0e15b6e5323abc2e6cc5a;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index acfe95d923..e6b6b420db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,15 +5,10 @@ AUTOMAKE_OPTIONS = subdir-objects NULL = -SUBDIRS = - EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym BUILT_SOURCES = modules/builtin.h misc/revision.c CLEANFILES = $(BUILT_SOURCES) -MOSTLYCLEANFILES = - -TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox ############################################################################### # Headers @@ -35,64 +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_codec_synchro.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_symbols.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_vout.h \ ../include/vlc_xml.h \ - ../include/vlc_vout_synchro.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 @@ -100,28 +115,41 @@ modules/modules.c: modules/builtin.h # Building libvlc ############################################################################### +nice: + $(top_builddir)/compile + lib_LTLIBRARIES = libvlc.la libvlc-control.la -AM_LDFLAGS = -no-undefined +AM_LDFLAGS = -no-undefined -no-install if HAVE_WIN32 AM_LDFLAGS += -avoid-version endif libvlc_la_SOURCES = $(SOURCES_libvlc) nodist_libvlc_la_SOURCES = misc/revision.c -libvlc_la_LIBADD = $(INCLUDED_LIBINTL) +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` \ - -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0 +libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \ + -version-info 1:0:0 +if HAVE_COMPILER_EXPORT +libvlc_la_LDFLAGS += -export-dynamic +else +libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym +endif + libvlc_la_DEPENDENCIES = libvlc.sym libvlc_control_la_SOURCES = $(SOURCES_libvlc_control) libvlc_control_la_LIBADD = libvlc.la libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` -libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' \ - -version-info 0:0:0 +libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 +if HAVE_COMPILER_EXPORT +libvlc_control_la_LDFLAGS += -export-dynamic +else +libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' +endif EXTRA_libvlc_la_SOURCES = \ $(SOURCES_libvlc_beos) \ @@ -195,6 +223,7 @@ SOURCES_libvlc_common = \ input/clock.c \ input/control.c \ input/decoder.c \ + input/decoder_synchro.c \ input/demux.c \ input/es_out.c \ input/input.c \ @@ -211,7 +240,6 @@ SOURCES_libvlc_common = \ video_output/video_text.c \ video_output/video_widgets.c \ video_output/vout_subpictures.c \ - video_output/vout_synchro.c \ video_output/vout_intf.c \ audio_output/aout_internal.h \ audio_output/common.c \ @@ -248,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 \ @@ -259,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 \ @@ -289,29 +319,27 @@ 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_list_view.c \ + control/media_library.c \ control/mediacontrol_internal.h \ control/mediacontrol_core.c \ control/mediacontrol_util.c \ - control/mediacontrol_audio_video.c + control/mediacontrol_audio_video.c \ + control/media_discoverer.c \ + control/tag_query.c ############################################################################### # Stamp rules ############################################################################### -if !USE_LIBTOOL -if !HAVE_WIN32 -stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl - ( cd $(srcdir) && cat $(HEADERS_include) ) | \ - top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl - touch stamp-api - -CLEANFILES += stamp-api -endif -endif - misc/revision.c: rm -f $@ $@.tmp echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp @@ -322,10 +350,8 @@ misc/revision.c: ############################################################################### # Unit/regression test ############################################################################### -if USE_LIBTOOL check_PROGRAMS = test_i18n_atof test_url test_utf8 TESTS = $(check_PROGRAMS) -endif CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`