X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=99f6e0c90bdeb03825bc6834c76169fc23cf5753;hb=036838fac2f4dc8aba41819971645587a4dccd4d;hp=51bf953a7ff69e90c761ed5614a98db7fe6cff42;hpb=9d9587c8a81c5f91441614f3460f0c4008011f77;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 51bf953a7f..99f6e0c90b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 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)
 
 ###############################################################################
@@ -39,6 +39,7 @@ HEADERS_include = \
 	../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 \
@@ -69,6 +70,7 @@ HEADERS_include = \
 	../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 \
@@ -82,7 +84,6 @@ HEADERS_include = \
 	../include/vlc_vlm.h \
 	../include/vlc_vod.h \
 	../include/vlc_vout.h \
-	../include/vlc_vout_synchro.h \
 	../include/vlc_xml.h \
 	$(NULL)
 
@@ -111,6 +112,20 @@ endif
 
 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
 ###############################################################################
@@ -120,31 +135,31 @@ nice:
 
 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
@@ -223,6 +238,7 @@ SOURCES_libvlc_common = \
 	input/clock.c \
 	input/control.c \
 	input/decoder.c \
+	input/decoder_synchro.c \
 	input/demux.c \
 	input/es_out.c \
 	input/input.c \
@@ -239,7 +255,6 @@ SOURCES_libvlc_common = \
 	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 \
@@ -321,11 +336,13 @@ SOURCES_libvlc_control = \
 	control/audio.c \
 	control/dynamic_media_list.c \
 	control/event.c \
-	control/flat_media_list.c \
+	control/flat_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 \
@@ -348,7 +365,7 @@ misc/revision.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`
@@ -364,6 +381,10 @@ test_utf8_SOURCES = test/utf8.c
 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