###############################################################################
AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = . test
NULL =
EXTRA_DIST = extras/COPYING modules/builtin.h.in \
libvlc.sym \
libvlccore.sym
-BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
+BUILT_SOURCES = modules/builtin.h ../include/vlc_about.h
CLEANFILES = $(BUILT_SOURCES)
SUFFIXES = .pc.in .pc
# Headers
###############################################################################
-pkgincludedir = $(includedir)/vlc
pluginsincludedir = $(pkgincludedir)/plugins
pkginclude_HEADERS = \
../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 \
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
-DMODULE_STRING=\"main\" \
-DLOCALEDIR=\"$(localedir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DDATA_PATH=\"$(pkgdatadir)\" \
+ -DDATA_PATH=\"$(vlcdatadir)\" \
-DLIBDIR=\"$(libdir)\" \
- -DPLUGIN_PATH=\"$(pkglibdir)\"
+ -DPLUGIN_PATH=\"$(vlclibdir)\"
libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
-export-symbols $(srcdir)/libvlccore.sym \
- -version-info 0:1:0
+ -version-info 1:0:0
libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
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:1:0 \
+ -version-info 2:2: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 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
libvlc.c \
libvlc.h \
libvlc-module.c \
+ missing.c \
version.c \
interface/interface.h \
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/ressource.h \
+ input/ressource.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/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/es_format.c \
modules/modules.h \
modules/modules.c \
modules/cache.c \
misc/filter_chain.c \
$(NULL)
+SOURCES_libvlc_httpd = \
+ network/httpd.c \
+ $(NULL)
+
SOURCES_libvlc_sout = \
stream_output/stream_output.c \
stream_output/stream_output.h \
# 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 --head -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
-###############################################################################
-
-EXTRA_PROGRAMS = vlc vlc-wrapper
-if BUILD_VLC
-bin_PROGRAMS = vlc
-if !HAVE_WIN32
-bin_PROGRAMS += vlc-wrapper
-endif
-endif
+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
-EXTRA_vlc_SOURCES = vlc.c winvlc.c
-if !HAVE_WIN32
-vlc_SOURCES = vlc.c
-else
-vlc_SOURCES = winvlc.c
-endif
-vlc_wrapper_SOURCES = network/rootwrap.c
-
-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
+misc/revision.c:
+ $(MAKE) misc/revision.c.tmp
+ cat misc/revision.c.tmp > misc/revision.c
-if HAVE_WIN32
-DATA_win32_rc = $(noinst_DATA)
-noinst_DATA = vlc_win32_rc.$(OBJEXT)
+BUILT_SOURCES += misc/revision.c.tmp misc/revision.c
-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
+.PHONY: misc/revision.c.tmp
###############################################################################
# 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`; \