libvlc.pc.in \
vlc-plugin.pc.in \
libvlc.sym \
- libvlccore.sym
+ libvlccore.sym \
+ ../include/vlc/libvlc_version.h.in
-BUILT_SOURCES = ../include/vlc_about.h
+BUILT_SOURCES = \
+ $(nodist_pkginclude_HEADERS) \
+ $(nodist_pluginsinclude_HEADERS)
CLEANFILES = $(BUILT_SOURCES)
-SUFFIXES = .pc.in .pc
+SUFFIXES = .pc.in .pc .rc.in .rc
###############################################################################
# Headers
../include/vlc/vlc.h \
../include/vlc/deprecated.h \
../include/vlc/libvlc.h \
- ../include/vlc/libvlc_structures.h \
- ../include/vlc/libvlc_media_list.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_player.h \
+ ../include/vlc/libvlc_structures.h \
../include/vlc/libvlc_vlm.h \
- ../include/vlc/mediacontrol.h \
- ../include/vlc/mediacontrol_structures.h \
$(NULL)
+nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h
pluginsinclude_HEADERS = \
../include/vlc_access.h \
../include/vlc_acl.h \
../include/vlc_aout.h \
+ ../include/vlc_aout_mixer.h \
../include/vlc_arrays.h \
+ ../include/vlc_art_finder.h \
+ ../include/vlc_atomic.h \
../include/vlc_avcodec.h \
../include/vlc_bits.h \
../include/vlc_block.h \
../include/vlc_config.h \
../include/vlc_config_cat.h \
../include/vlc_configuration.h \
+ ../include/vlc_cpu.h \
../include/vlc_dialog.h \
../include/vlc_demux.h \
../include/vlc_epg.h \
../include/vlc_events.h \
../include/vlc_filter.h \
../include/vlc_fourcc.h \
+ ../include/vlc_fs.h \
../include/vlc_gcrypt.h \
+ ../include/vlc_http.h \
../include/vlc_httpd.h \
../include/vlc_image.h \
+ ../include/vlc_inhibit.h \
../include/vlc_input.h \
../include/vlc_input_item.h \
../include/vlc_main.h \
../include/vlc_md5.h \
../include/vlc_messages.h \
../include/vlc_meta.h \
+ ../include/vlc_media_library.h \
../include/vlc_modules.h \
+ ../include/vlc_mouse.h \
../include/vlc_mtime.h \
../include/vlc_objects.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_probe.h \
../include/vlc_rand.h \
../include/vlc_services_discovery.h \
+ ../include/vlc_sql.h \
../include/vlc_sout.h \
+ ../include/vlc_spu.h \
../include/vlc_stream.h \
../include/vlc_strings.h \
../include/vlc_subpicture.h \
+ ../include/vlc_text_style.h \
../include/vlc_threads.h \
../include/vlc_url.h \
../include/vlc_variables.h \
../include/vlc_vlm.h \
+ ../include/vlc_video_splitter.h \
../include/vlc_vout.h \
- ../include/vlc_window.h \
+ ../include/vlc_vout_display.h \
+ ../include/vlc_vout_opengl.h \
+ ../include/vlc_vout_osd.h \
+ ../include/vlc_vout_window.h \
../include/vlc_xml.h \
+ ../include/vlc_xlib.h \
$(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
noinst_HEADERS = \
- ../include/mmx.h \
../include/vlc_codec_synchro.h \
../include/vlc_codecs.h \
- ../include/vlc_devices.h \
+ ../include/vlc_extensions.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_memory.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 \
+ ../include/vlc_vout_wrapper.h \
+ ../include/vlc_windows_interfaces.h \
$(NULL)
+../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
+ $(AM_V_GEN)cd "$(top_builddir)" && \
+ $(SHELL) ./config.status --file="src/$@"
+
../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" "$@"
+ $(AM_V_at)rm -f -- "$@.tmp"
+ $(AM_V_at)mkdir -p -- ../include
+ $(AM_V_GEN)(echo "/* Automatically generated file - DO NOT EDIT */" && \
+ echo "static const char psz_license[] =" && \
+ sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" && \
+ echo ";" && \
+ echo "static const char psz_thanks[] =" && \
+ sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
+ "$(top_srcdir)/THANKS" && \
+ echo ";" && \
+ echo "static const char psz_authors[] =" && \
+ sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
+ "$(top_srcdir)/AUTHORS" && \
+ echo ";") >> "$@.tmp"
+ $(AM_V_at)mv -f -- "$@.tmp" "$@"
###############################################################################
# pkg-config integration
CLEANFILES += $(pkgconfig_DATA)
.pc.in.pc: $(top_builddir)/config.status
+ $(AM_V_GEN)cd "$(top_builddir)" && \
+ $(SHELL) ./config.status --file="src/$@"
+
+##############################################################################
+# Windows resource files
+##############################################################################
+
+if HAVE_WIN32
+noinst_DATA = libvlc_win32_rc.rc
+endif
+EXTRA_DIST += libvlc_win32_rc.rc.in
+
+.rc.in.rc: $(top_builddir)/config.status
cd "$(top_builddir)" && \
$(SHELL) ./config.status --file="src/$@"
# Building libvlc
###############################################################################
-nice:
- $(top_builddir)/compile
-
lib_LTLIBRARIES = libvlccore.la libvlc.la
AM_LDFLAGS = -no-undefined
endif
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)\"
+ -DPKGLIBDIR=\"$(vlclibdir)\"
libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
-no-undefined \
-export-symbols $(srcdir)/libvlccore.sym \
- -version-info 3:0:0
+ -version-info 5:0:0
libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
$(LTLIBINTL) ../compat/libcompat.la
libvlccore_la_DEPENDENCIES = libvlccore.sym
libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
endif
-libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
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 \
+ -version-info 6:0:1 \
-export-symbols $(srcdir)/libvlc.sym
libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
if HAVE_WIN32
$(SOURCES_libvlc_linux) \
$(SOURCES_libvlc_win32) \
$(SOURCES_libvlc_other) \
- $(SOURCES_libvlc_dirent) \
- $(SOURCES_libvlc_getopt) \
$(SOURCES_libvlc_httpd) \
$(SOURCES_libvlc_sout) \
$(SOURCES_libvlc_vlm) \
endif
endif
endif
-if BUILD_DIRENT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
-endif
-if BUILD_GETOPT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
-endif
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
endif
SOURCES_libvlc_beos = \
+ misc/atomic.c \
misc/pthread.c \
$(NULL)
SOURCES_libvlc_darwin = \
+ config/dirs_macos.c \
+ misc/atomic.c \
misc/pthread.c \
misc/darwin_specific.c \
$(NULL)
SOURCES_libvlc_linux = \
+ config/dirs_xdg.c \
+ misc/atomic.c \
misc/pthread.c \
misc/linux_specific.c \
$(NULL)
SOURCES_libvlc_win32 = \
- misc/w32thread.c \
- misc/win32_specific.c \
- network/winsock.c \
+ win32/dirs.c \
+ win32/specific.c \
+ win32/atomic.c \
+ win32/thread.c \
+ win32/winsock.c \
$(NULL)
SOURCES_libvlc_other = \
+ config/dirs_xdg.c \
+ misc/atomic.c \
misc/pthread.c \
misc/not_specific.c
-SOURCES_libvlc_dirent = \
- extras/dirent.c \
- $(NULL)
-
-SOURCES_libvlc_getopt = \
- extras/getopt.c \
- extras/getopt.h \
- extras/getopt1.c \
- $(NULL)
-
SOURCES_libvlc_common = \
libvlc.c \
libvlc.h \
input/es_out_timeshift.c \
input/event.c \
input/input.c \
+ input/info.h \
input/meta.c \
input/access.h \
input/clock.h \
input/stream_memory.c \
input/subtitles.c \
input/var.c \
+ video_output/chrono.h \
+ video_output/control.c \
+ video_output/control.h \
+ video_output/display.c \
+ video_output/display.h \
+ video_output/event.h \
+ video_output/inhibit.c \
+ video_output/inhibit.h \
+ video_output/interlacing.c \
+ video_output/interlacing.h \
+ video_output/snapshot.c \
+ video_output/snapshot.h \
+ video_output/statistic.h \
+ video_output/postprocessing.c \
+ video_output/postprocessing.h \
video_output/video_output.c \
video_output/vout_pictures.c \
- video_output/vout_pictures.h \
video_output/video_text.c \
+ video_output/video_epg.c \
video_output/video_widgets.c \
video_output/vout_subpictures.c \
+ video_output/window.c \
video_output/vout_intf.c \
video_output/vout_internal.h \
video_output/vout_control.h \
+ video_output/vout_wrapper.c \
audio_output/aout_internal.h \
audio_output/common.c \
audio_output/dec.c \
audio_output/intf.c \
osd/osd.c \
osd/osd_text.c \
- osd/osd_widgets.c \
network/acl.c \
network/getaddrinfo.c \
network/io.c \
text/strings.c \
text/unicode.c \
text/filesystem.c \
- text/wincp.c \
text/iso_lang.c \
text/iso-639_def.h \
misc/md5.c \
+ misc/probe.c \
misc/rand.c \
misc/mtime.c \
misc/block.c \
misc/fourcc.c \
misc/es_format.c \
+ misc/picture_fifo.c \
+ misc/picture_pool.c \
modules/modules.h \
modules/modules.c \
modules/cache.c \
modules/entry.c \
modules/os.c \
+ modules/textdomain.c \
misc/threads.c \
misc/stats.c \
misc/cpu.c \
misc/action.c \
+ misc/epg.c \
+ misc/exit.c \
config/configuration.h \
config/core.c \
- config/dirs.c \
config/chain.c \
config/file.c \
config/intf.c \
+ config/keys.c \
config/cmdline.c \
+ config/dirs.c \
+ config/getopt.c \
+ config/vlc_getopt.h \
misc/events.c \
misc/image.c \
misc/messages.c \
misc/error.c \
misc/update.h \
misc/update.c \
+ misc/update_crypto.c \
misc/xml.c \
- misc/devices.c \
+ misc/media_library.c \
extras/libc.c \
+ extras/tdestroy.c \
+ misc/filter.c \
misc/filter_chain.c \
+ misc/http_auth.c \
+ misc/sql.c \
+ misc/text_style.c \
+ misc/subpicture.c \
+ misc/subpicture.h \
$(NULL)
SOURCES_libvlc_httpd = \
$(OPT_SOURCES_libvlc_beos) \
$(OPT_SOURCES_libvlc_darwin) \
$(OPT_SOURCES_libvlc_win32) \
- $(OPT_SOURCES_libvlc_dirent) \
- $(OPT_SOURCES_libvlc_getopt) \
$(NULL)
SOURCES_libvlc_control = \
control/libvlc_internal.h \
+ control/event_internal.h \
+ control/media_internal.h \
+ control/media_list_internal.h \
+ control/media_player_internal.h \
control/core.c \
+ control/error.c \
control/log.c \
control/playlist.c \
control/vlm.c \
control/video.c \
control/audio.c \
control/event.c \
- control/flat_media_list_view.c \
- control/hierarchical_media_list_view.c \
- control/hierarchical_node_media_list_view.c \
+ control/event_async.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
+###############################################################################
+# GIT revision
+###############################################################################
+
+BUILT_SOURCES += stamp-revision
+CLEANFILES += revision.txt revision.c
+
+revision.c: revision.txt
+ $(AM_V_at)rm -f -- revision.c
+ $(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
+ > revision.c
+
+revision.txt: Makefile.am
+ $(AM_V_at)$(MAKE) stamp-revision
+ $(AM_V_GEN)touch revision.txt
+
+stamp-revision:
+ $(AM_V_at)rm -f -- revision.tmp
+ $(AM_V_GEN)(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
+ --match '?.*.*' --always || echo exported) > revision.tmp
+ $(AM_V_at)if diff revision.tmp revision.txt >/dev/null 2>&1; then \
+ rm -f -- revision.tmp; \
+ else \
+ mv -f -- revision.tmp revision.txt; \
+ fi 2>&1
+
###############################################################################
# Unit/regression test
###############################################################################
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 \
projects / vlc / blobdiff