SUBDIRS = . test
NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+EXTRA_DIST = extras/COPYING \
misc/beos_specific.cpp \
libvlc.pc.in \
vlc-plugin.pc.in \
libvlc.sym \
libvlccore.sym
-BUILT_SOURCES = modules/builtin.h ../include/vlc_about.h
+BUILT_SOURCES = ../include/vlc_about.h
CLEANFILES = $(BUILT_SOURCES)
SUFFIXES = .pc.in .pc
../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_list.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 \
../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_config.h \
../include/vlc_config_cat.h \
../include/vlc_configuration.h \
+ ../include/vlc_dialog.h \
../include/vlc_demux.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_httpd.h \
../include/vlc_image.h \
../include/vlc_modules.h \
../include/vlc_mtime.h \
../include/vlc_objects.h \
+ ../include/vlc_picture.h \
../include/vlc_playlist.h \
../include/vlc_plugin.h \
../include/vlc_rand.h \
../include/vlc_sout.h \
../include/vlc_stream.h \
../include/vlc_strings.h \
+ ../include/vlc_subpicture.h \
../include/vlc_threads.h \
../include/vlc_url.h \
../include/vlc_variables.h \
../include/vlc_vod.h \
$(NULL)
-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
endif
libvlccore_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlccore_la_SOURCES = misc/revision.c
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+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 libvlc` $(AM_LDFLAGS) \
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+ -no-undefined \
-export-symbols $(srcdir)/libvlccore.sym \
- -version-info 2:0:0
-libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
+ -version-info 3: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)
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_la_LIBADD = libvlccore.la
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
- -DMODULE_STRING=\"control\"
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info 4:0:2 \
+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
endif
SOURCES_libvlc_beos = \
+ 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/not_specific.c
+SOURCES_libvlc_other = \
+ misc/pthread.c \
+ misc/not_specific.c
SOURCES_libvlc_dirent = \
extras/dirent.c \
libvlc-module.c \
missing.c \
version.c \
- interface/interface.h \
+ interface/dialog.c \
interface/interface.c \
interface/intf_eject.c \
- interface/interaction.c \
playlist/playlist_internal.h \
playlist/art.c \
playlist/art.h \
input/input_internal.h \
input/input_interface.h \
input/vlm_internal.h \
- input/ressource.h \
- input/ressource.c \
+ input/vlm_event.h \
+ input/resource.h \
+ input/resource.c \
input/stream.c \
input/stream_demux.c \
input/stream_filter.c \
misc/rand.c \
misc/mtime.c \
misc/block.c \
+ misc/fourcc.c \
misc/es_format.c \
modules/modules.h \
modules/modules.c \
SOURCES_libvlc_vlm = \
input/vlm.c \
+ input/vlm_event.c \
input/vlmshell.c \
$(NULL)
SOURCES_libvlc_control = \
control/libvlc_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/mediacontrol_audio_video.c \
control/media_discoverer.c
-###############################################################################
-# Stamp rules
-###############################################################################
-
-misc/revision.c.tmp:
- rm -f -- $@
- echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@
- REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo "$(VERSION)")"; \
- echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@
- diff $@ misc/revision.c >/dev/null 2>&1 || \
- cat misc/revision.c.tmp > misc/revision.c
-
-misc/revision.c:
- $(MAKE) misc/revision.c.tmp
- cat misc/revision.c.tmp > misc/revision.c
-
-BUILT_SOURCES += misc/revision.c.tmp misc/revision.c
-
-.PHONY: misc/revision.c.tmp
-
###############################################################################
# Unit/regression test
###############################################################################
projects / vlc / blobdiff