###############################################################################
AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = . test
NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in \
- vlc-control.pc.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 misc/revision.c ../include/vlc_about.h
+BUILT_SOURCES = ../include/vlc_about.h
CLEANFILES = $(BUILT_SOURCES)
SUFFIXES = .pc.in .pc
# Headers
###############################################################################
-pkgincludedir = $(includedir)/vlc
pluginsincludedir = $(pkgincludedir)/plugins
pkginclude_HEADERS = \
../include/vlc/vlc.h \
- ../include/vlc/common.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_input.h \
+ ../include/vlc_input_item.h \
../include/vlc_main.h \
../include/vlc_md5.h \
../include/vlc_messages.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_vlm.h \
../include/vlc_vout.h \
+ ../include/vlc_window.h \
../include/vlc_xml.h \
$(NULL)
../include/vlc_network.h \
../include/vlc_osd.h \
../include/vlc_pgpkey.h \
- ../include/vlc_streaming.h \
../include/vlc_tls.h \
../include/vlc_update.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
###############################################################################
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vlc-control.pc vlc-plugin.pc
+pkgconfig_DATA = libvlc.pc vlc-plugin.pc
CLEANFILES += $(pkgconfig_DATA)
.pc.in.pc: $(top_builddir)/config.status
lib_LTLIBRARIES = libvlccore.la libvlc.la
-AM_LDFLAGS = -no-undefined -no-install
+AM_LDFLAGS = -no-undefined
if HAVE_WIN32
AM_LDFLAGS += -avoid-version
endif
+if HAVE_WINCE
+AM_LDFLAGS += -avoid-version
+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=\"$(pkgdatadir)\" \
+ -DDATA_PATH=\"$(vlcdatadir)\" \
-DLIBDIR=\"$(libdir)\" \
- -DPLUGIN_PATH=\"$(pkglibdir)\"
-libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
-libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+ -DPLUGIN_PATH=\"$(vlclibdir)\"
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+ -no-undefined \
-export-symbols $(srcdir)/libvlccore.sym \
- -version-info 0: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)
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
+endif
+
+libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+ $(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 2:0:0 \
+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_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_beos) \
$(SOURCES_libvlc_other) \
$(SOURCES_libvlc_dirent) \
$(SOURCES_libvlc_getopt) \
+ $(SOURCES_libvlc_httpd) \
$(SOURCES_libvlc_sout) \
+ $(SOURCES_libvlc_vlm) \
$(NULL)
if HAVE_BEOS
libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
if BUILD_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/not_specific.c
+SOURCES_libvlc_other = \
+ misc/pthread.c \
+ misc/not_specific.c
SOURCES_libvlc_dirent = \
extras/dirent.c \
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 \
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 \
video_output/video_widgets.c \
video_output/vout_subpictures.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 \
network/io.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 \
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 \
misc/variables.h \
misc/variables.c \
misc/error.c \
- misc/variables.h \
+ misc/update.h \
misc/update.c \
misc/xml.c \
misc/devices.c \
extras/libc.c \
+ misc/filter_chain.c \
+ $(NULL)
+
+SOURCES_libvlc_httpd = \
+ network/httpd.c \
$(NULL)
SOURCES_libvlc_sout = \
- input/vlm.c \
- input/vlmshell.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 \
$(NULL)
+SOURCES_libvlc_vlm = \
+ input/vlm.c \
+ input/vlm_event.c \
+ input/vlmshell.c \
+ $(NULL)
+
SOURCES_libvlc = \
$(SOURCES_libvlc_common) \
$(OPT_SOURCES_libvlc_beos) \
control/mediacontrol_audio_video.c \
control/media_discoverer.c
-###############################################################################
-# Stamp rules
-###############################################################################
-
-misc/revision.c:
- rm -f $@ $@.tmp
- echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
- REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
- REVISION="$$(echo $$REVISION|cut -b -10)"; \
- echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
- mv -f $@.tmp $@
-
-
-###############################################################################
-# Building vlc
-###############################################################################
-
-if BUILD_VLC
-bin_PROGRAMS = vlc
-endif
-
-if !HAVE_WIN32
-vlc_SOURCES = vlc.c
-else
-vlc_SOURCES = winvlc.c
-endif
-
-vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
-
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-# vlc needs libvlccore for locale conversion
-vlc_LDADD = $(DATA_win32_rc) libvlc.la libvlccore.la $(LTLIBINTL) \
- `$(VLC_CONFIG) -libs vlc`
-
-if BUILD_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
-
-if HAVE_WIN32
-DATA_win32_rc = $(noinst_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 $(top_srcdir)/share -i $< -o $@
-endif
-endif
-
###############################################################################
# Unit/regression test
###############################################################################
-check_PROGRAMS = \
- test_block \
- test_dictionary \
- test_i18n_atof \
- test_url \
- test_utf8 \
- test_headers \
- $(NULL)
dist_check_SCRIPTS = check_symbols check_headers
-TESTS = $(check_PROGRAMS) check_symbols
-
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
-
-test_block_SOURCES = test/block.c
-test_block_LDADD = libvlccore.la
-test_block_CFLAGS = $(CFLAGS_tests)
-
-test_dictionary_SOURCES = test/dictionary.c
-test_dictionary_LDADD = libvlccore.la
-test_dictionary_CFLAGS = $(CFLAGS_tests)
-
-test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
-test_i18n_atof_LDADD = libvlccore.la
-test_i18n_atof_CFLAGS = $(CFLAGS_tests)
-
-test_url_SOURCES = test/url.c
-test_url_LDADD = libvlccore.la
-test_url_CFLAGS = $(CFLAGS_tests)
-
-test_utf8_SOURCES = test/utf8.c
-test_utf8_LDADD = libvlccore.la
-test_utf8_CFLAGS = $(CFLAGS_tests)
-
-test_headers_SOURCES = test/headers.c
-test_headers_CFLAGS = $(CFLAGS_tests)
+TESTS = check_symbols
check-local:
for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \