X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=35029d24f8471461f1468976f983e6cbe9cfe430;hb=0a520894c4451459a1e93426a1042e88be5db0cc;hp=489612800190a99a22509f2eb10c7de941f16628;hpb=c13f9fc955acf4504a5336752feebea388773702;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 4896128001..35029d24f8 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 -EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in - -BUILT_SOURCES = $(CLEANFILES) -CLEANFILES = misc/modules_builtin.h -MOSTLYCLEANFILES = $(DATA_noinst_libvlc) - -TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox +BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h +CLEANFILES = $(BUILT_SOURCES) ############################################################################### # Headers @@ -24,175 +19,201 @@ pkgincludedir = $(includedir)/vlc dist_pkginclude_HEADERS = \ ../include/vlc/vlc.h \ ../include/vlc/libvlc.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/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_events.h \ ../include/vlc_filter.h \ - ../include/vlc_config_cat.h \ + ../include/vlc_fixups.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_osd.h \ + ../include/vlc_pgpkey.h \ ../include/vlc_playlist.h \ + ../include/vlc_plugin.h \ + ../include/vlc_rand.h \ + ../include/vlc_services_discovery.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) -misc/modules_builtin.h: misc/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 + +../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS + rm -f -- "$@.tmp" + mkdir -p -- ../include + echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp" + echo "static const char psz_license[] =" >> "$@.tmp" + cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp" + echo ";" >> "$@.tmp" + echo "static const char psz_thanks[] =" >> "$@.tmp" + grep -v '$$Id:' $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp" + echo ";" >> "$@.tmp" + echo "static const char psz_authors[] =" >> "$@.tmp" + grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp" + echo ";" >> "$@.tmp" + mv -f -- "$@.tmp" "$@" + +############################################################################### +# pkg-config integration +############################################################################### + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = vlc-control.pc +CLEANFILES += $(pkgconfig_DATA) -misc/modules.c: misc/modules_builtin.h +vlc-control.pc: vlc-control.pc.in $(top_builddir)/config.status + cd $(top_builddir) && \ + $(SHELL) ./config.status --file=src/vlc-control.pc ############################################################################### # Building libvlc ############################################################################### -libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control) -nodist_libvlc_a_SOURCES = misc/version.c -libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags libvlc pic` -DUSE_BUILTINS -libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc pic` -libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc pic` +nice: + $(top_builddir)/compile + +lib_LTLIBRARIES = libvlc.la libvlc-control.la + +AM_LDFLAGS = -no-undefined -no-install +if HAVE_WIN32 +AM_LDFLAGS += -avoid-version +endif libvlc_la_SOURCES = $(SOURCES_libvlc) -libvlc_la_LIBADD = $(INCLUDED_LIBINTL) -libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` +nodist_libvlc_la_SOURCES = misc/revision.c +libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ + -DDATA_PATH=\"$(pkgdatadir)\" libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` -libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` \ - -no-undefined -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0 +libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags 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_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) + 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 = \ - -no-undefined -export-symbols-regex '_?(libvlc|mediacontrol)_.*' \ - -version-info 0:0:0 +libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1: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) \ + $(SOURCES_libvlc_darwin) \ + $(SOURCES_libvlc_win32) \ + $(SOURCES_libvlc_dirent) \ + $(SOURCES_libvlc_getopt) \ + $(NULL) if HAVE_BEOS -OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) +libvlc_la_SOURCES += $(SOURCES_libvlc_beos) endif if HAVE_DARWIN -OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) +libvlc_la_SOURCES += $(SOURCES_libvlc_darwin) endif if HAVE_WIN32 -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) +libvlc_la_SOURCES += $(SOURCES_libvlc_win32) endif if HAVE_WINCE -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) +libvlc_la_SOURCES += $(SOURCES_libvlc_win32) endif if BUILD_DIRENT -OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) +libvlc_la_SOURCES += $(SOURCES_libvlc_dirent) endif if BUILD_GETOPT -OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) -endif - -# Build libvlc as a shared library -if USE_LIBTOOL -lib_LTLIBRARIES = libvlc.la libvlc-control.la -else -lib_LIBRARIES = libvlc.a +libvlc_la_SOURCES += $(SOURCES_libvlc_getopt) endif -if HAVE_WIN32 -pic = -else -pic = pic -endif - -if HAVE_WIN32 -if BUILD_SHARED -DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a -endif - -libvlc.dll.a: libvlc$(LIBEXT) - $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS) - -libvlc$(LIBEXT): $(OBJECTS_libvlc_so) - @ldfl="`$(VLC_CONFIG) --libs plugin vlc pic` $(INCLUDED_LIBINTL)" ; \ - case `$(VLC_CONFIG) --linkage vlc` in \ - c++) ld="$(CXXLINK)" ;; \ - objc) ld="$(OBJCLINK)" ;; \ - c|*) ld="$(LINK)" ;; \ - esac ; \ - echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \ - $$ld $(libvlc_a_OBJECTS) \ - $$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 libtool work-around - @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi -endif - -EXTRA_DIST += \ - $(SOURCES_libvlc_beos) \ - $(SOURCES_libvlc_darwin) \ - $(SOURCES_libvlc_win32) \ - $(SOURCES_libvlc_dirent) \ - $(SOURCES_libvlc_getopt) \ - $(NULL) - SOURCES_libvlc_beos = \ misc/beos_specific.cpp \ $(NULL) SOURCES_libvlc_darwin = \ - misc/darwin_specific.m \ + misc/darwin_specific.c \ $(NULL) SOURCES_libvlc_win32 = \ @@ -233,11 +254,13 @@ 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 \ input/meta.c \ input/input_internal.h \ + input/vlm_internal.h \ input/stream.c \ input/mem_stream.c \ input/subtitles.c \ @@ -248,7 +271,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 \ @@ -263,8 +285,8 @@ SOURCES_libvlc_common = \ 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 \ osd/osd_widgets.c \ network/acl.c \ @@ -276,22 +298,32 @@ SOURCES_libvlc_common = \ network/httpd.c \ network/rootwrap.c \ network/tls.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.h \ - misc/modules.c \ + modules/modules.h \ + modules/modules.c \ + modules/cache.c \ + modules/entry.c \ + modules/os.c \ misc/threads.c \ misc/stats.c \ misc/cpu.c \ - misc/configuration.h \ - misc/configuration.c \ - misc/configuration_chain.c \ + config/configuration.h \ + config/core.c \ + config/chain.c \ + config/file.c \ + config/intf.c \ + config/cmdline.c \ + misc/events.c \ misc/image.c \ misc/messages.c \ misc/objects.c \ @@ -301,7 +333,6 @@ SOURCES_libvlc_common = \ misc/update.c \ input/vlm.c \ misc/xml.c \ - misc/dict.c \ misc/devices.c \ extras/libc.c \ $(NULL) @@ -321,62 +352,124 @@ SOURCES_libvlc_control = \ control/log.c \ control/playlist.c \ control/vlm.c \ - control/input.c \ control/video.c \ control/audio.c \ + control/dynamic_media_list.c \ + control/event.c \ + control/flat_media_list_view.c \ + control/hierarchical_media_list_view.c \ + control/hierarchical_node_media_list_view.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 - -if !USE_LIBTOOL -if !BUILD_SHARED -CLEANFILES += misc/version.c -endif + control/mediacontrol_audio_video.c \ + control/media_discoverer.c \ + control/tag_query.c -# Install shared libvlc -install-exec-local: - test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)" +############################################################################### +# Stamp rules +############################################################################### -# the opposite of install-{data,exec}-local -uninstall-local: - test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)" -endif +misc/revision.c: + rm -f $@ $@.tmp + echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp + REVISION="$$(LANG=C git-show-ref -s HEAD 2>/dev/null | cut -b -10 || echo exported)"; \ + echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp + mv -f $@.tmp $@ -misc/version.c: FORCE - $(TOOLBOX) --update-version ############################################################################### -# Stamp rules +# Building vlc ############################################################################### -if !USE_LIBTOOL -if !BUILD_SHARED -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 +bin_PROGRAMS = vlc +# +vlc_SOURCES = vlc.c +vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la + +vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` +vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc` + +vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) + @rm -f vlc$(EXEEXT) + @case `$(VLC_CONFIG) --linkage vlc builtin` in \ + c++) cmd="$(CXXLINK)" ;; \ + objc) cmd="$(OBJCLINK)" ;; \ + c|*) cmd="$(LINK)" ;; \ + esac ; \ + cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ + echo $$cmd ; \ + eval $$cmd -CLEANFILES += stamp-api -endif +if HAVE_WIN32 +DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA) +noinst_DATA = vlc_win32_rc.$(OBJEXT) + +vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc + $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@ endif ############################################################################### # Unit/regression test ############################################################################### -if USE_LIBTOOL -check_PROGRAMS = test_i18n_atof test_url -TESTS = $(check_PROGRAMS) +check_PROGRAMS = \ + test_dictionary \ + test_i18n_atof \ + test_url \ + test_utf8 \ + test_headers \ + test_control \ + $(NULL) + +dist_check_SCRIPTS = check_symbols +TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS) CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` -test_i18n_atof_SOURCES = test/i18n_atof.c +test_dictionary_SOURCES = test/dictionary.c +test_dictionary_LDADD = libvlc.la +test_dictionary_CFLAGS = $(CFLAGS_tests) + +test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c test_i18n_atof_LDADD = libvlc.la 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) + +test_headers_SOURCES = test/headers.c +test_headers_CFLAGS = $(CFLAGS_tests) + +test_control_SOURCES = control/testapi.c +test_control_LDADD = libvlc-control.la +test_control_CFLAGS = $(CFLAGS_tests) + +check-local: + for h in `echo $(dist_pkginclude_HEADERS) $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \ + do \ + echo grep - "#include <$$h>" $(srcdir)/test/headers.c ; \ + if ! grep -- "#include <$$h>" $(srcdir)/test/headers.c ; \ + then \ + echo "Header $$h not included in test/headers.c!"; \ + exit 1; \ + fi ; \ + done FORCE: + @echo "Generated source cannot be phony. Go away." >&2 + @exit 1 + +.PHONY: FORCE