NULL =
EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
-BUILT_SOURCES = modules/builtin.h misc/revision.c
+BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
CLEANFILES = $(BUILT_SOURCES)
###############################################################################
../include/vlc_block_helper.h \
../include/vlc_charset.h \
../include/vlc_codec.h \
+ ../include/vlc_codec_synchro.h \
../include/vlc_codecs.h \
../include/vlc_common.h \
../include/vlc_config.h \
../include/vlc_osd.h \
../include/vlc_playlist.h \
../include/vlc_rand.h \
+ ../include/vlc_services_discovery.h \
../include/vlc_sout.h \
../include/vlc_stream.h \
../include/vlc_streaming.h \
../include/vlc_vlm.h \
../include/vlc_vod.h \
../include/vlc_vout.h \
- ../include/vlc_vout_synchro.h \
../include/vlc_xml.h \
$(NULL)
modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
rm -f -- "$@.tmp"
- cat "$<" > "$@.tmp"
+ cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
if !HAVE_PLUGINS
plugins="$$($(VLC_CONFIG) --list plugin)" ; \
test -n "$${plugins}" && \
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
+ 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" "$@"
###############################################################################
# Building libvlc
###############################################################################
lib_LTLIBRARIES = libvlc.la libvlc-control.la
-AM_LDFLAGS = -no-undefined
+AM_LDFLAGS = -no-undefined -no-install
if HAVE_WIN32
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) \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags 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
endif
+libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
libvlc_la_DEPENDENCIES = libvlc.sym
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
+libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
if HAVE_COMPILER_EXPORT
libvlc_control_la_LDFLAGS += -export-dynamic
else
input/clock.c \
input/control.c \
input/decoder.c \
+ input/decoder_synchro.c \
input/demux.c \
input/es_out.c \
input/input.c \
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 \
audio_output/aout_internal.h \
audio_output/common.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 \
misc/threads.c \
misc/stats.c \
misc/cpu.c \
- modules/configuration.h \
- modules/configuration.c \
- modules/configuration_chain.c \
+ config/configuration.h \
+ config/core.c \
+ config/chain.c \
+ config/file.c \
+ config/cmdline.c \
misc/events.c \
misc/image.c \
misc/messages.c \
control/audio.c \
control/dynamic_media_list.c \
control/event.c \
- control/flat_media_list.c \
+ control/flat_media_list_view.c \
+ control/hierarchical_media_list_view.c \
control/media_descriptor.c \
control/media_instance.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 \
###############################################################################
# Unit/regression test
###############################################################################
-check_PROGRAMS = test_i18n_atof test_url test_utf8
+check_PROGRAMS = test_i18n_atof test_url test_utf8 test_control
TESTS = $(check_PROGRAMS)
CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
test_utf8_LDADD = libvlc.la
test_utf8_CFLAGS = $(CFLAGS_tests)
+test_control_SOURCES = control/testapi.c
+test_control_LDADD = libvlc-control.la
+test_control_CFLAGS = $(CFLAGS_tests)
+
FORCE:
@echo "Generated source cannot be phony. Go away." >&2
@exit 1