X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=7e9888a5889b4cb7f9fdb9808f612f33368508da;hb=e3a247dcf704620577e05d597e1e7bcda8937203;hp=258bc98264cf006b607584cbade80aed496ce01e;hpb=5aac3e5a2086ed7595fae6293d81636fb43481a7;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 258bc98264..7e9888a588 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,16 +5,10 @@ AUTOMAKE_OPTIONS = subdir-objects NULL = -SUBDIRS = +EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym -EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in - -BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES) -DISTCLEANFILES = stamp-api -CLEANFILES = misc/modules_builtin.h -MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins - -TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox +BUILT_SOURCES = modules/builtin.h misc/revision.c +CLEANFILES = $(BUILT_SOURCES) ############################################################################### # Headers @@ -25,207 +19,170 @@ pkgincludedir = $(includedir)/vlc dist_pkginclude_HEADERS = \ ../include/vlc/vlc.h \ ../include/vlc/libvlc.h \ - ../include/vlc/aout.h \ - ../include/vlc/vout.h \ - ../include/vlc/sout.h \ - ../include/vlc/decoder.h \ - ../include/vlc/input.h \ - ../include/vlc/intf.h \ + ../include/vlc/libvlc_structures.h \ ../include/vlc/mediacontrol.h \ ../include/vlc/mediacontrol_structures.h \ $(NULL) noinst_HEADERS = $(HEADERS_include) -noinst_DATA = $(DATA_noinst_libvlc) HEADERS_include = \ - ../include/aout_internal.h \ - ../include/audio_output.h \ - ../include/beos_specific.h \ - ../include/charset.h \ - ../include/codecs.h \ - ../include/configuration.h \ - ../include/darwin_specific.h \ - ../include/intf_eject.h \ ../include/iso_lang.h \ ../include/main.h \ ../include/mmx.h \ - ../include/modules.h \ - ../include/modules_inner.h \ - ../include/mtime.h \ - ../include/network.h \ - ../include/os_specific.h \ - ../include/snapshot.h \ - ../include/stream_output.h \ - ../include/variables.h \ - ../include/video_output.h \ ../include/vlc_access.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_cpu.h \ + ../include/vlc_config_cat.h \ + ../include/vlc_configuration.h \ ../include/vlc_demux.h \ - ../include/vlc_error.h \ + ../include/vlc_devices.h \ + ../include/vlc_epg.h \ ../include/vlc_es.h \ ../include/vlc_es_out.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_interaction.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_spu.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_video.h \ + ../include/vlc_variables.h \ ../include/vlc_vlm.h \ ../include/vlc_vod.h \ + ../include/vlc_vout.h \ + ../include/vlc_vout_synchro.h \ ../include/vlc_xml.h \ - ../include/vout_synchro.h \ - ../include/win32_specific.h \ - ../include/libvlc_internal.h \ - ../include/mediacontrol_internal.h $(NULL) -misc/modules_builtin.h: Makefile misc/modules_builtin.h.in ../vlc-config - $(TOOLBOX) --update-includes - touch $@ - -misc/modules.c: misc/modules_builtin.h - -############################################################################### -# Building builtin modules -############################################################################### -# -# As long as we use builtins with a shared libvlc, we must build them before -# we build libvlc. Maybe one day, libvlc will handle multiple modules per -# shared object, which will make builtins fairly redumdant. Until then, we -# need this workaround. - -stamp-builtins: Makefile ../vlc-config ../config.status -if USE_LIBTOOL - @for c in `$(VLC_CONFIG) --libs builtin`; do \ - case $$c in \ - ../modules/*.a) echo $$c ;; \ - esac ; \ - done | \ - sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2_builtin.la,g' | \ - while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done +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 -if BUILD_SHARED - @for c in `$(VLC_CONFIG) --libs builtin`; do \ - case $$c in \ - ../modules/*.a) echo $$c ;; \ - esac ; \ - done | \ - sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \ - while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done + 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 - touch $@ + echo ' } while( 0 );' >> "$@.tmp" + mv -f -- "$@.tmp" "$@" + +modules/modules.c: modules/builtin.h ############################################################################### # Building libvlc ############################################################################### -libvlc_a_SOURCES = $(SOURCES_libvlc) -libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc $(pic)` -libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc $(pic)` -libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc $(pic)` - -libvlc_la_SOURCES = $(SOURCES_libvlc) -libvlc_la_LIBADD = $(INCLUDED_LIBINTL) -libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` -libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` -libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \ - -avoid-version -no-undefined -libvlc_la_DEPENDENCIES = stamp-builtins +nice: + $(top_builddir)/compile +lib_LTLIBRARIES = libvlc.la libvlc-control.la -if HAVE_BEOS -OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) -endif -if HAVE_DARWIN -OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) -endif +AM_LDFLAGS = -no-undefined -no-install if HAVE_WIN32 -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) -endif -if HAVE_WINCE -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) -endif -if BUILD_DIRENT -OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) -endif -if BUILD_GETOPT -OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) +AM_LDFLAGS += -avoid-version endif -# Build libvlc as a shared library -if USE_LIBTOOL -lib_LTLIBRARIES = libvlc.la +libvlc_la_SOURCES = $(SOURCES_libvlc) +nodist_libvlc_la_SOURCES = misc/revision.c +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 = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \ + -version-info 1:0:0 +if HAVE_COMPILER_EXPORT +libvlc_la_LDFLAGS += -export-dynamic else -lib_LIBRARIES = libvlc.a +libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym endif -if HAVE_WIN32 -if BUILD_SHARED -DATA_noinst_libvlc = libvlc$(LIBEXT) -endif +libvlc_la_DEPENDENCIES = libvlc.sym -libvlc.dll.a: libvlc$(LIBEXT) - -libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins - @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \ - case `$(VLC_CONFIG) --linkage vlc builtin` in \ - c++) ld="$(CXXLINK)" ;; \ - objc) ld="$(OBJCLINK)" ;; \ - c|*) ld="$(LINK)" ;; \ - esac ; \ - echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \ - $$ld $(libvlc_a_OBJECTS) \ - -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl -# It sucks big time, but we have to do that to link vlc properly -# on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over -# libvlc$(LIBEXT) - rm -f libvlc.a -# Cygwin work-around - @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi +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) -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_DIST += \ +EXTRA_libvlc_la_SOURCES = \ $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_win32) \ $(SOURCES_libvlc_dirent) \ $(SOURCES_libvlc_getopt) \ $(NULL) +if HAVE_BEOS +libvlc_la_SOURCES += $(SOURCES_libvlc_beos) +endif +if HAVE_DARWIN +libvlc_la_SOURCES += $(SOURCES_libvlc_darwin) +endif +if HAVE_WIN32 +libvlc_la_SOURCES += $(SOURCES_libvlc_win32) +endif +if HAVE_WINCE +libvlc_la_SOURCES += $(SOURCES_libvlc_win32) +endif +if BUILD_DIRENT +libvlc_la_SOURCES += $(SOURCES_libvlc_dirent) +endif +if BUILD_GETOPT +libvlc_la_SOURCES += $(SOURCES_libvlc_getopt) +endif SOURCES_libvlc_beos = \ misc/beos_specific.cpp \ $(NULL) SOURCES_libvlc_darwin = \ - misc/darwin_specific.m \ + misc/darwin_specific.c \ $(NULL) SOURCES_libvlc_win32 = \ @@ -244,10 +201,14 @@ SOURCES_libvlc_getopt = \ SOURCES_libvlc_common = \ libvlc.c \ + libvlc-common.c \ libvlc.h \ + libvlc-module.c \ + interface/interface.h \ interface/interface.c \ interface/intf_eject.c \ interface/interaction.c \ + playlist/playlist_internal.h \ playlist/thread.c \ playlist/control.c \ playlist/engine.c \ @@ -265,7 +226,9 @@ SOURCES_libvlc_common = \ input/demux.c \ input/es_out.c \ input/input.c \ + input/meta.c \ input/input_internal.h \ + input/vlm_internal.h \ input/stream.c \ input/mem_stream.c \ input/subtitles.c \ @@ -278,6 +241,7 @@ SOURCES_libvlc_common = \ video_output/vout_subpictures.c \ video_output/vout_synchro.c \ video_output/vout_intf.c \ + audio_output/aout_internal.h \ audio_output/common.c \ audio_output/dec.c \ audio_output/filters.c \ @@ -286,8 +250,11 @@ SOURCES_libvlc_common = \ audio_output/output.c \ audio_output/intf.c \ stream_output/stream_output.c \ + stream_output/stream_output.h \ stream_output/announce.c \ + stream_output/profiles.c \ stream_output/sap.c \ + stream_output/sdp.c \ osd/osd.c \ osd/osd_parser.c \ osd/osd_text.c \ @@ -301,44 +268,40 @@ SOURCES_libvlc_common = \ network/httpd.c \ network/rootwrap.c \ network/tls.c \ - misc/charset.c \ + network/poll.c \ + text/charset.c \ + text/strings.c \ + text/unicode.c \ + text/wincp.c \ + text/iso_lang.c \ + text/iso-639_def.h \ misc/md5.c \ + misc/rand.c \ misc/mtime.c \ misc/block.c \ - misc/modules.c \ + modules/modules.h \ + modules/modules.c \ + modules/entry.c \ misc/threads.c \ misc/stats.c \ - misc/strings.c \ - misc/unicode.c \ misc/cpu.c \ - misc/configuration.c \ + modules/configuration.h \ + modules/configuration.c \ + modules/configuration_chain.c \ + misc/events.c \ misc/image.c \ - misc/iso_lang.c \ - misc/iso-639_def.h \ misc/messages.c \ misc/objects.c \ + misc/variables.h \ misc/variables.c \ misc/error.c \ misc/update.c \ - misc/vlm.c \ + input/vlm.c \ misc/xml.c \ - misc/hashtables.c \ misc/devices.c \ extras/libc.c \ - control/core.c \ - control/playlist.c \ - control/vlm.c \ - control/input.c \ - control/video.c \ - control/audio.c \ - control/mediacontrol_core.c \ - control/mediacontrol_util.c \ - control/mediacontrol_audio_video.c \ $(NULL) -# These should be distributed, but not compiled -EXTRA_DIST += control/mediacontrol_init.c control/mediacontrol_plugin.c - SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ $(OPT_SOURCES_libvlc_beos) \ @@ -348,50 +311,62 @@ SOURCES_libvlc = \ $(OPT_SOURCES_libvlc_getopt) \ $(NULL) - -if !USE_LIBTOOL -if !BUILD_SHARED -SOURCES_libvlc += misc/version.c -CLEANFILES += misc/version.c - -misc/version.c: FORCE - $(TOOLBOX) --update-version -FORCE: - -endif - -# Install shared libvlc -install-exec-local: - test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)" - -# the opposite of install-{data,exec}-local -uninstall-local: - test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)" -endif +SOURCES_libvlc_control = \ + control/libvlc_internal.h \ + control/core.c \ + control/log.c \ + control/playlist.c \ + 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 ############################################################################### # Stamp rules ############################################################################### -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 + +misc/revision.c: + rm -f $@ $@.tmp + echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp + REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \ + echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp + mv -f $@.tmp $@ ############################################################################### # Unit/regression test ############################################################################### -if USE_LIBTOOL -check_PROGRAMS = test_i18n_atof test_url +check_PROGRAMS = test_i18n_atof test_url test_utf8 TESTS = $(check_PROGRAMS) -CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc` +CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` -test_i18n_atof_SOURCES = test/i18n_atof.c -test_i18n_atof_LDADD = libvlc.la +test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c test_i18n_atof_CFLAGS = $(CFLAGS_tests) test_url_SOURCES = test/url.c test_url_LDADD = libvlc.la test_url_CFLAGS = $(CFLAGS_tests) -endif +test_utf8_SOURCES = test/utf8.c +test_utf8_LDADD = libvlc.la +test_utf8_CFLAGS = $(CFLAGS_tests) + +FORCE: + @echo "Generated source cannot be phony. Go away." >&2 + @exit 1 + +.PHONY: FORCE