X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=319666f126440ff2be595cbef10ac3b4e27df8e9;hb=1af951aa88cb8f1f322f8e7f91e879c2c98fbabd;hp=f5e5242544fefad6aac24a1ccd7a0ba93cc0f1d1;hpb=5ebdd3e10056f7e21cad77a127619274a0a5c005;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index f5e5242544..1a7502e96f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,113 +3,149 @@ ############################################################################### AUTOMAKE_OPTIONS = subdir-objects +SUBDIRS = . test NULL = -EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym +EXTRA_DIST = extras/COPYING \ + misc/beos_specific.cpp \ + libvlc.pc.in \ + vlc-plugin.pc.in \ + libvlc.sym \ + libvlccore.sym -BUILT_SOURCES = modules/builtin.h misc/revision.c +BUILT_SOURCES = ../include/vlc_about.h CLEANFILES = $(BUILT_SOURCES) +SUFFIXES = .pc.in .pc + ############################################################################### # Headers ############################################################################### -pkgincludedir = $(includedir)/vlc +pluginsincludedir = $(pkgincludedir)/plugins -dist_pkginclude_HEADERS = \ +pkginclude_HEADERS = \ ../include/vlc/vlc.h \ + ../include/vlc/deprecated.h \ ../include/vlc/libvlc.h \ + ../include/vlc/libvlc_events.h \ + ../include/vlc/libvlc_media.h \ + ../include/vlc/libvlc_media_discoverer.h \ + ../include/vlc/libvlc_media_library.h \ + ../include/vlc/libvlc_media_list.h \ + ../include/vlc/libvlc_media_list_player.h \ + ../include/vlc/libvlc_media_list_view.h \ + ../include/vlc/libvlc_media_player.h \ ../include/vlc/libvlc_structures.h \ + ../include/vlc/libvlc_vlm.h \ ../include/vlc/mediacontrol.h \ ../include/vlc/mediacontrol_structures.h \ $(NULL) -noinst_HEADERS = $(HEADERS_include) - -HEADERS_include = \ - ../include/iso_lang.h \ - ../include/main.h \ - ../include/mmx.h \ +pluginsinclude_HEADERS = \ ../include/vlc_access.h \ ../include/vlc_acl.h \ ../include/vlc_aout.h \ ../include/vlc_arrays.h \ + ../include/vlc_avcodec.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_dialog.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_fourcc.h \ + ../include/vlc_gcrypt.h \ + ../include/vlc_http.h \ ../include/vlc_httpd.h \ ../include/vlc_image.h \ ../include/vlc_input.h \ - ../include/vlc_interface.h \ - ../include/vlc_intf_strings.h \ - ../include/vlc_keys.h \ + ../include/vlc_input_item.h \ + ../include/vlc_main.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_picture.h \ + ../include/vlc_picture_fifo.h \ + ../include/vlc_picture_pool.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_subpicture.h \ ../include/vlc_threads.h \ - ../include/vlc_threads_funcs.h \ - ../include/vlc_tls.h \ - ../include/vlc_update.h \ ../include/vlc_url.h \ ../include/vlc_variables.h \ ../include/vlc_vlm.h \ - ../include/vlc_vod.h \ + ../include/vlc_video_splitter.h \ ../include/vlc_vout.h \ - ../include/vlc_vout_synchro.h \ + ../include/vlc_window.h \ ../include/vlc_xml.h \ $(NULL) -modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am +noinst_HEADERS = \ + ../include/mmx.h \ + ../include/vlc_codec_synchro.h \ + ../include/vlc_codecs.h \ + ../include/vlc_devices.h \ + ../include/vlc_fixups.h \ + ../include/vlc_interface.h \ + ../include/vlc_intf_strings.h \ + ../include/vlc_iso_lang.h \ + ../include/vlc_keys.h \ + ../include/vlc_network.h \ + ../include/vlc_osd.h \ + ../include/vlc_pgpkey.h \ + ../include/vlc_tls.h \ + ../include/vlc_update.h \ + ../include/vlc_vod.h \ + $(NULL) + +../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS 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" + mkdir -p -- ../include + echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp" + echo "static const char psz_license[] =" >> "$@.tmp" + sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" >> "$@.tmp" + echo ";" >> "$@.tmp" + echo "static const char psz_thanks[] =" >> "$@.tmp" + sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \ + "$(top_srcdir)/THANKS" >> "$@.tmp" + echo ";" >> "$@.tmp" + echo "static const char psz_authors[] =" >> "$@.tmp" + sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \ + "$(top_srcdir)/AUTHORS" >> "$@.tmp" + echo ";" >> "$@.tmp" + mv -f -- "$@.tmp" "$@" -modules/modules.c: modules/builtin.h +############################################################################### +# pkg-config integration +############################################################################### + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libvlc.pc vlc-plugin.pc +CLEANFILES += $(pkgconfig_DATA) + +.pc.in.pc: $(top_builddir)/config.status + cd "$(top_builddir)" && \ + $(SHELL) ./config.status --file="src/$@" ############################################################################### # Building libvlc @@ -118,77 +154,128 @@ modules/modules.c: modules/builtin.h nice: $(top_builddir)/compile -lib_LTLIBRARIES = libvlc.la libvlc-control.la +lib_LTLIBRARIES = libvlccore.la libvlc.la AM_LDFLAGS = -no-undefined if HAVE_WIN32 AM_LDFLAGS += -avoid-version endif +if HAVE_WINCE +AM_LDFLAGS += -avoid-version +endif -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 -libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym +libvlccore_la_SOURCES = $(SOURCES_libvlc) +nodist_libvlccore_la_SOURCES = revision.c +libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \ + -DMODULE_STRING=\"main\" \ + -DLOCALEDIR=\"$(localedir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DDATA_PATH=\"$(vlcdatadir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DPLUGIN_PATH=\"$(vlclibdir)\" +libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ + -no-undefined \ + -export-symbols $(srcdir)/libvlccore.sym \ + -version-info 4:0:0 +libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \ + $(LTLIBINTL) ../compat/libcompat.la +libvlccore_la_DEPENDENCIES = libvlccore.sym +if HAVE_WIN32 +libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) +libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) endif -libvlc_la_DEPENDENCIES = libvlc.sym +libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc + $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ -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)_.*' +libvlc_la_SOURCES = $(SOURCES_libvlc_control) +nodist_libvlc_la_SOURCES = revision.c +libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \ + libvlccore.la ../compat/libcompat.la +libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` +libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \ + -version-info 5:0:0 \ + -export-symbols $(srcdir)/libvlc.sym +libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la +if HAVE_WIN32 +libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib) +libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib) endif -EXTRA_libvlc_la_SOURCES = \ + +EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ + $(SOURCES_libvlc_linux) \ $(SOURCES_libvlc_win32) \ + $(SOURCES_libvlc_other) \ $(SOURCES_libvlc_dirent) \ $(SOURCES_libvlc_getopt) \ + $(SOURCES_libvlc_httpd) \ + $(SOURCES_libvlc_sout) \ + $(SOURCES_libvlc_vlm) \ $(NULL) if HAVE_BEOS -libvlc_la_SOURCES += $(SOURCES_libvlc_beos) -endif +libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) +else if HAVE_DARWIN -libvlc_la_SOURCES += $(SOURCES_libvlc_darwin) -endif +libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin) +else +if HAVE_LINUX +libvlccore_la_SOURCES += $(SOURCES_libvlc_linux) +else if HAVE_WIN32 -libvlc_la_SOURCES += $(SOURCES_libvlc_win32) -endif +libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) +else if HAVE_WINCE -libvlc_la_SOURCES += $(SOURCES_libvlc_win32) +libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) +else +libvlccore_la_SOURCES += $(SOURCES_libvlc_other) +endif +endif +endif +endif endif if BUILD_DIRENT -libvlc_la_SOURCES += $(SOURCES_libvlc_dirent) +libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent) endif if BUILD_GETOPT -libvlc_la_SOURCES += $(SOURCES_libvlc_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 +libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm) +endif endif SOURCES_libvlc_beos = \ - misc/beos_specific.cpp \ + misc/pthread.c \ $(NULL) SOURCES_libvlc_darwin = \ + misc/pthread.c \ misc/darwin_specific.c \ $(NULL) +SOURCES_libvlc_linux = \ + misc/pthread.c \ + misc/linux_specific.c \ + $(NULL) + SOURCES_libvlc_win32 = \ + misc/w32thread.c \ misc/win32_specific.c \ + network/winsock.c \ $(NULL) +SOURCES_libvlc_other = \ + misc/pthread.c \ + misc/not_specific.c + SOURCES_libvlc_dirent = \ extras/dirent.c \ $(NULL) @@ -201,19 +288,25 @@ SOURCES_libvlc_getopt = \ SOURCES_libvlc_common = \ libvlc.c \ - libvlc-common.c \ libvlc.h \ libvlc-module.c \ - interface/interface.h \ + missing.c \ + version.c \ + interface/dialog.c \ 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 \ @@ -223,14 +316,32 @@ SOURCES_libvlc_common = \ input/clock.c \ input/control.c \ input/decoder.c \ + 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/vlm_event.h \ + input/resource.h \ + input/resource.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 \ @@ -239,8 +350,9 @@ 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 \ + video_output/vout_internal.h \ + video_output/vout_control.h \ audio_output/aout_internal.h \ audio_output/common.c \ audio_output/dec.c \ @@ -249,29 +361,21 @@ SOURCES_libvlc_common = \ audio_output/mixer.c \ 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 \ osd/osd_widgets.c \ network/acl.c \ network/getaddrinfo.c \ network/io.c \ - network/error.c \ network/tcp.c \ network/udp.c \ - network/httpd.c \ - network/rootwrap.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 \ @@ -279,15 +383,24 @@ SOURCES_libvlc_common = \ misc/rand.c \ misc/mtime.c \ misc/block.c \ + misc/fourcc.c \ + misc/es_format.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 \ - modules/configuration.h \ - modules/configuration.c \ - modules/configuration_chain.c \ + misc/action.c \ + config/configuration.h \ + config/core.c \ + config/dirs.c \ + config/chain.c \ + config/file.c \ + config/intf.c \ + config/cmdline.c \ misc/events.c \ misc/image.c \ misc/messages.c \ @@ -295,11 +408,32 @@ SOURCES_libvlc_common = \ misc/variables.h \ misc/variables.c \ misc/error.c \ + misc/update.h \ misc/update.c \ - input/vlm.c \ misc/xml.c \ misc/devices.c \ extras/libc.c \ + misc/filter.c \ + misc/filter_chain.c \ + misc/http_auth.c \ + $(NULL) + +SOURCES_libvlc_httpd = \ + network/httpd.c \ + $(NULL) + +SOURCES_libvlc_sout = \ + stream_output/stream_output.c \ + stream_output/stream_output.h \ + stream_output/announce.c \ + stream_output/sap.c \ + stream_output/sdp.c \ + $(NULL) + +SOURCES_libvlc_vlm = \ + input/vlm.c \ + input/vlm_event.c \ + input/vlmshell.c \ $(NULL) SOURCES_libvlc = \ @@ -313,57 +447,93 @@ SOURCES_libvlc = \ SOURCES_libvlc_control = \ control/libvlc_internal.h \ + control/event_internal.h \ + control/media_internal.h \ + control/media_list_internal.h \ + control/media_list_view_internal.h \ + control/media_player_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/event_async.c \ + control/flat_media_list_view.c \ + control/hierarchical_media_list_view.c \ + control/hierarchical_node_media_list_view.c \ + control/media.c \ + control/media_player.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/media_discoverer.c \ - control/tag_query.c + control/media_discoverer.c ############################################################################### -# Stamp rules +# GIT revision ############################################################################### -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 $@ +BUILT_SOURCES += stamp-revision +CLEANFILES += revision.txt revision.c -############################################################################### -# Unit/regression test -############################################################################### -check_PROGRAMS = test_i18n_atof test_url test_utf8 -TESTS = $(check_PROGRAMS) +revision.c: revision.txt + rm -f -- revision.c + echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ + > revision.c -CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` +revision.txt: + $(MAKE) stamp-revision + touch revision.txt -test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c -test_i18n_atof_CFLAGS = $(CFLAGS_tests) +stamp-revision: + rm -f -- revision.tmp + (git --git-dir="$(top_srcdir)/.git/" describe --tags --long \ + --always || echo exported) > revision.tmp + diff revision.tmp revision.txt >/dev/null 2>&1 || \ + mv -f -- revision.tmp revision.txt -test_url_SOURCES = test/url.c -test_url_LDADD = libvlc.la -test_url_CFLAGS = $(CFLAGS_tests) +############################################################################### +# Unit/regression test +############################################################################### -test_utf8_SOURCES = test/utf8.c -test_utf8_LDADD = libvlc.la -test_utf8_CFLAGS = $(CFLAGS_tests) +dist_check_SCRIPTS = check_symbols check_headers +TESTS = check_symbols + +check_DATA = libvlc-headers.sym libvlc-sorted.sym +CLEANFILES += $(check_DATA) + +libvlc-sorted.sym: libvlccore.sym + rm -f libvlc-sorted.sym + sort -fdu < "$(srcdir)/libvlccore.sym" > libvlc-sorted.sym + +libvlc-headers.sym: + rm -f libvlc-headers.sym + cat ${srcdir}/../include/vlc_*.h ${srcdir}/control/*.h | \ + sed -n -e 's/^[ ]*VLC_EXPORT[ ]*([^,]*,\([^,]*\),.*/\1/p' | \ + sed -e 's/[^a-zA-Z0-9_]*//' | \ + sort -fdu > libvlc-headers.sym + +.PHONY: libvlc-headers.sym + +check-local: + for h in `echo $(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 + $(srcdir)/check_headers $(pkginclude_HEADERS) + $(srcdir)/check_headers $(pluginsinclude_HEADERS) FORCE: @echo "Generated source cannot be phony. Go away." >&2