X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=a34dda02cf81c516c0e89fee5d722cba2cb7d20c;hb=f659703fb4033420e0607d34bc7cd880a5802ea7;hp=c4335d60407496f87da39bbce0a03b7a6c8af4f3;hpb=9ddd87dfbd46953dc9dae60684873cf1a32fbd04;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index c4335d6040..a34dda02cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,226 +1,335 @@
-
+###############################################################################
 # Automake targets and declarations
 ###############################################################################
 
 AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = . test
 
 NULL =
-SUBDIRS =
-
-EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING \
+	misc/beos_specific.cpp \
+	libvlc.pc.in \
+	vlc-plugin.pc.in \
+	libvlc.sym \
+	libvlccore.sym \
+	../include/vlc/libvlc_version.h.in
 
-BUILT_SOURCES = $(CLEANFILES)
-CLEANFILES = misc/modules_builtin.h
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
+BUILT_SOURCES = \
+	$(nodist_pkginclude_HEADERS) \
+	$(nodist_pluginsinclude_HEADERS)
+CLEANFILES = $(BUILT_SOURCES)
 
-TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
+SUFFIXES = .pc.in .pc .rc.in .rc
 
 ###############################################################################
 # Headers
 ###############################################################################
 
-pkgincludedir = $(includedir)/vlc
+pluginsincludedir = $(pkgincludedir)/plugins
 
-dist_pkginclude_HEADERS = \
+pkginclude_HEADERS = \
 	../include/vlc/vlc.h \
+	../include/vlc/deprecated.h \
 	../include/vlc/libvlc.h \
-	../include/vlc/mediacontrol.h \
-	../include/vlc/mediacontrol_structures.h \
+	../include/vlc/libvlc_events.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_player.h \
+	../include/vlc/libvlc_structures.h \
+	../include/vlc/libvlc_vlm.h \
 	$(NULL)
+nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h
 
-noinst_HEADERS = $(HEADERS_include)
-noinst_DATA = $(DATA_noinst_libvlc)
-
-HEADERS_include = \
-	../include/iso_lang.h \
-	../include/main.h \
-	../include/mmx.h \
-	../include/vlc_modules.h \
-	../include/vlc_modules_macros.h \
-	../include/vlc_os_specific.h \
-	../include/vlc_mtime.h \
-	../include/vlc_network.h \
-	../include/vlc_codecs.h \
-	../include/vlc_configuration.h \
-	../include/vlc_charset.h \
-	../include/vlc_sout.h \
-	../include/vlc_streaming.h \
-	../include/vlc_variables.h \
-	../include/vlc_aout.h \
+pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
-	../include/vlc_arrays.h \
 	../include/vlc_acl.h \
+	../include/vlc_aout.h \
+	../include/vlc_aout_mixer.h \
+	../include/vlc_arrays.h \
+	../include/vlc_art_finder.h \
+	../include/vlc_atomic.h \
+	../include/vlc_avcodec.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
 	../include/vlc_block_helper.h \
+	../include/vlc_charset.h \
 	../include/vlc_codec.h \
 	../include/vlc_common.h \
 	../include/vlc_config.h \
+	../include/vlc_config_cat.h \
+	../include/vlc_configuration.h \
+	../include/vlc_cpu.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_config_cat.h \
+	../include/vlc_fourcc.h \
+	../include/vlc_fs.h \
+	../include/vlc_gcrypt.h \
+	../include/vlc_http.h \
 	../include/vlc_httpd.h \
-	../include/vlc_tls.h \
-	../include/vlc_md5.h \
-	../include/vlc_devices.h \
 	../include/vlc_image.h \
+	../include/vlc_inhibit.h \
 	../include/vlc_input.h \
-	../include/vlc_interface.h \
-	../include/vlc_intf_strings.h \
-	../include/vlc_keys.h \
+	../include/vlc_input_item.h \
+	../include/vlc_main.h \
+	../include/vlc_md5.h \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
+	../include/vlc_media_library.h \
+	../include/vlc_modules.h \
+	../include/vlc_mouse.h \
+	../include/vlc_mtime.h \
 	../include/vlc_objects.h \
-	../include/vlc_osd.h \
+	../include/vlc_picture.h \
+	../include/vlc_picture_fifo.h \
+	../include/vlc_picture_pool.h \
 	../include/vlc_playlist.h \
+	../include/vlc_plugin.h \
+	../include/vlc_probe.h \
+	../include/vlc_rand.h \
+	../include/vlc_services_discovery.h \
+	../include/vlc_sql.h \
+	../include/vlc_sout.h \
+	../include/vlc_spu.h \
 	../include/vlc_stream.h \
 	../include/vlc_strings.h \
-	../include/vlc_symbols.h \
-	../include/vlc_threads_funcs.h \
+	../include/vlc_subpicture.h \
+	../include/vlc_text_style.h \
 	../include/vlc_threads.h \
-	../include/vlc_update.h \
 	../include/vlc_url.h \
-	../include/vlc_vout.h \
+	../include/vlc_variables.h \
 	../include/vlc_vlm.h \
-	../include/vlc_vod.h \
+	../include/vlc_video_splitter.h \
+	../include/vlc_vout.h \
+	../include/vlc_vout_display.h \
+	../include/vlc_vout_opengl.h \
+	../include/vlc_vout_osd.h \
+	../include/vlc_vout_window.h \
 	../include/vlc_xml.h \
-	../include/vlc_vout_synchro.h \
+	../include/vlc_xlib.h \
 	$(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
-misc/modules_builtin.h: misc/modules_builtin.h.in
-	$(TOOLBOX) --update-includes
-	touch $@
+noinst_HEADERS = \
+	../include/vlc_codec_synchro.h \
+	../include/vlc_codecs.h \
+	../include/vlc_extensions.h \
+	../include/vlc_fixups.h \
+	../include/vlc_interface.h \
+	../include/vlc_intf_strings.h \
+	../include/vlc_iso_lang.h \
+	../include/vlc_keys.h \
+	../include/vlc_memory.h \
+	../include/vlc_network.h \
+	../include/vlc_osd.h \
+	../include/vlc_pgpkey.h \
+	../include/vlc_tls.h \
+	../include/vlc_update.h \
+	../include/vlc_vod.h \
+	../include/vlc_vout_wrapper.h \
+	../include/vlc_windows_interfaces.h \
+	$(NULL)
 
-misc/modules.c: misc/modules_builtin.h
+../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
+	$(AM_V_GEN)cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="src/$@"
+
+../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
+	$(AM_V_at)rm -f -- "$@.tmp"
+	$(AM_V_at)mkdir -p -- ../include
+	$(AM_V_GEN)(echo "/* Automatically generated file - DO NOT EDIT */" && \
+	echo "static const char psz_license[] =" && \
+	sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" && \
+	echo ";" && \
+	echo "static const char psz_thanks[] =" && \
+	sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
+		"$(top_srcdir)/THANKS" && \
+	echo ";" && \
+	echo "static const char psz_authors[] =" && \
+	sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
+		"$(top_srcdir)/AUTHORS" && \
+	echo ";") >> "$@.tmp"
+	$(AM_V_at)mv -f -- "$@.tmp" "$@"
 
 ###############################################################################
-# Building libvlc
+# pkg-config integration
 ###############################################################################
 
-libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags libvlc pic` -DUSE_BUILTINS
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc pic`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc pic`
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libvlc.pc vlc-plugin.pc
+CLEANFILES += $(pkgconfig_DATA)
 
-libvlc_la_SOURCES = $(SOURCES_libvlc)
-libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
-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` \
-	-no-undefined -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0
-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 = \
-	-no-undefined -export-symbols-regex '_?(libvlc|mediacontrol)_.*' \
-	-version-info 0:0:0
+.pc.in.pc: $(top_builddir)/config.status
+	$(AM_V_GEN)cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="src/$@"
 
-if HAVE_BEOS
-OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
-endif
-if HAVE_DARWIN
-OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin)
+##############################################################################
+# Windows resource files
+##############################################################################
+
+if HAVE_WIN32
+noinst_DATA = libvlc_win32_rc.rc
 endif
+EXTRA_DIST += libvlc_win32_rc.rc.in
+
+.rc.in.rc: $(top_builddir)/config.status
+	cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="src/$@"
+
+###############################################################################
+# Building libvlc
+###############################################################################
+
+lib_LTLIBRARIES = libvlccore.la libvlc.la
+
+AM_LDFLAGS = -no-undefined
 if HAVE_WIN32
-OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
+AM_LDFLAGS += -avoid-version
 endif
 if HAVE_WINCE
-OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
-endif
-if BUILD_DIRENT
-OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent)
-endif
-if BUILD_GETOPT
-OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
-endif
-
-# Build libvlc as a shared library
-if USE_LIBTOOL
-lib_LTLIBRARIES = libvlc.la libvlc-control.la
-else
-lib_LIBRARIES = libvlc.a
+AM_LDFLAGS += -avoid-version
 endif
 
+libvlccore_la_SOURCES = $(SOURCES_libvlc)
+nodist_libvlccore_la_SOURCES = revision.c
+libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
+	-DMODULE_STRING=\"main\" \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DDATA_PATH=\"$(vlcdatadir)\" \
+	-DPKGLIBDIR=\"$(vlclibdir)\"
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+	-no-undefined \
+	-export-symbols $(srcdir)/libvlccore.sym \
+	-version-info 5:0:0
+libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
+	$(LTLIBINTL) ../compat/libcompat.la
+libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
-pic =
-else
-pic = pic
+libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
+	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+
+libvlc_la_SOURCES = $(SOURCES_libvlc_control)
+nodist_libvlc_la_SOURCES = revision.c
+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 6:0:1 \
+	-export-symbols $(srcdir)/libvlc.sym
+libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
-DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
-
-libvlc.dll.a libvlc.def: libvlc$(LIBEXT)
-	$(DLLTOOL) -z libvlc.def -l libvlc.dll.a -D $< $(libvlc_a_OBJECTS)
-
-libvlc$(LIBEXT): $(libvlc_a_OBJECTS)
-	@ldfl="`$(VLC_CONFIG) --libs plugin libvlc pic` $(INCLUDED_LIBINTL)" ; \
-	case `$(VLC_CONFIG) --linkage libvlc` in \
-	  c++)  ld="$(CXXLINK)" ;; \
-	  objc) ld="$(OBJCLINK)" ;; \
-	  c|*)  ld="$(LINK)" ;; \
-	esac ; \
-	echo $$ld $(libvlc_a_OBJECTS) $$ldfl; \
-	$$ld $(libvlc_a_OBJECTS) \
-		$$ldfl
-# It sucks big time, but we have to do that to link vlc properly
-# on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over
-# libvlc$(LIBEXT)
-	rm -f libvlc.a
-# Cygwin libtool work-around
-	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
+libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
 endif
 
-EXTRA_DIST += \
+
+EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_beos) \
 	$(SOURCES_libvlc_darwin) \
+	$(SOURCES_libvlc_linux) \
 	$(SOURCES_libvlc_win32) \
-	$(SOURCES_libvlc_dirent) \
-	$(SOURCES_libvlc_getopt) \
+	$(SOURCES_libvlc_other) \
+	$(SOURCES_libvlc_httpd) \
+	$(SOURCES_libvlc_sout) \
+	$(SOURCES_libvlc_vlm) \
 	$(NULL)
+if HAVE_BEOS
+libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
+else
+if HAVE_DARWIN
+libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
+else
+if HAVE_LINUX
+libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
+else
+if HAVE_WIN32
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
+else
+if HAVE_WINCE
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
+else
+libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
+endif
+endif
+endif
+endif
+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/atomic.c \
+	misc/pthread.c \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
+	config/dirs_macos.c \
+	misc/atomic.c \
+	misc/pthread.c \
 	misc/darwin_specific.c \
 	$(NULL)
 
-SOURCES_libvlc_win32 = \
-	misc/win32_specific.c \
+SOURCES_libvlc_linux = \
+	config/dirs_xdg.c \
+	misc/atomic.c \
+	misc/pthread.c \
+	misc/linux_specific.c \
 	$(NULL)
 
-SOURCES_libvlc_dirent = \
-	extras/dirent.c \
+SOURCES_libvlc_win32 = \
+	win32/dirs.c \
+	win32/specific.c \
+	win32/atomic.c \
+	win32/thread.c \
+	win32/winsock.c \
 	$(NULL)
 
-SOURCES_libvlc_getopt = \
-	extras/getopt.c \
-	extras/getopt.h \
-	extras/getopt1.c \
-	$(NULL)
+SOURCES_libvlc_other = \
+	config/dirs_xdg.c \
+	misc/atomic.c \
+	misc/pthread.c \
+	misc/not_specific.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 \
@@ -230,24 +339,61 @@ SOURCES_libvlc_common = \
 	input/clock.c \
 	input/control.c \
 	input/decoder.c \
+	input/decoder_synchro.c \
 	input/demux.c \
 	input/es_out.c \
+	input/es_out_timeshift.c \
+	input/event.c \
 	input/input.c \
+	input/info.h \
 	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/chrono.h \
+	video_output/control.c \
+	video_output/control.h \
+	video_output/display.c \
+	video_output/display.h \
+	video_output/event.h \
+	video_output/inhibit.c \
+	video_output/inhibit.h \
+	video_output/interlacing.c \
+	video_output/interlacing.h \
+	video_output/snapshot.c \
+	video_output/snapshot.h \
+	video_output/statistic.h \
+	video_output/postprocessing.c \
+	video_output/postprocessing.h \
 	video_output/video_output.c \
 	video_output/vout_pictures.c \
-	video_output/vout_pictures.h \
 	video_output/video_text.c \
+	video_output/video_epg.c \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
-	video_output/vout_synchro.c \
+	video_output/window.c \
 	video_output/vout_intf.c \
+	video_output/vout_internal.h \
+	video_output/vout_control.h \
+	video_output/vout_wrapper.c \
 	audio_output/aout_internal.h \
 	audio_output/common.c \
 	audio_output/dec.c \
@@ -256,53 +402,92 @@ SOURCES_libvlc_common = \
 	audio_output/mixer.c \
 	audio_output/output.c \
 	audio_output/intf.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 \
 	osd/osd.c \
-	osd/osd_parser.c \
 	osd/osd_text.c \
-	osd/osd_widgets.c \
 	network/acl.c \
 	network/getaddrinfo.c \
 	network/io.c \
-	network/error.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/iso_lang.c \
 	text/iso-639_def.h \
 	misc/md5.c \
+	misc/probe.c \
+	misc/rand.c \
 	misc/mtime.c \
 	misc/block.c \
-	misc/modules.h \
-	misc/modules.c \
+	misc/fourcc.c \
+	misc/es_format.c \
+	misc/picture_fifo.c \
+	misc/picture_pool.c \
+	modules/modules.h \
+	modules/modules.c \
+	modules/cache.c \
+	modules/entry.c \
+	modules/os.c \
+	modules/textdomain.c \
 	misc/threads.c \
 	misc/stats.c \
 	misc/cpu.c \
-	misc/configuration.h \
-	misc/configuration.c \
-	misc/configuration_chain.c \
+	misc/action.c \
+	misc/epg.c \
+	misc/exit.c \
+	config/configuration.h \
+	config/core.c \
+	config/chain.c \
+	config/file.c \
+	config/intf.c \
+	config/keys.c \
+	config/cmdline.c \
+	config/dirs.c \
+	config/getopt.c \
+	config/vlc_getopt.h \
+	misc/events.c \
 	misc/image.c \
 	misc/messages.c \
 	misc/objects.c \
 	misc/variables.h \
 	misc/variables.c \
 	misc/error.c \
+	misc/update.h \
 	misc/update.c \
-	input/vlm.c \
+	misc/update_crypto.c \
 	misc/xml.c \
-	misc/devices.c \
+	misc/media_library.c \
 	extras/libc.c \
+	extras/tdestroy.c \
+	misc/filter.c \
+	misc/filter_chain.c \
+	misc/http_auth.c \
+	misc/sql.c \
+	misc/text_style.c \
+	misc/subpicture.c \
+	misc/subpicture.h \
+	$(NULL)
+
+SOURCES_libvlc_httpd = \
+	network/httpd.c \
+	$(NULL)
+
+SOURCES_libvlc_sout = \
+	stream_output/stream_output.c \
+	stream_output/stream_output.h \
+	stream_output/announce.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 = \
@@ -310,77 +495,95 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_beos) \
 	$(OPT_SOURCES_libvlc_darwin) \
 	$(OPT_SOURCES_libvlc_win32) \
-	$(OPT_SOURCES_libvlc_dirent) \
-	$(OPT_SOURCES_libvlc_getopt) \
 	$(NULL)
 
 SOURCES_libvlc_control = \
 	control/libvlc_internal.h \
+	control/event_internal.h \
+	control/media_internal.h \
+	control/media_list_internal.h \
+	control/media_player_internal.h \
 	control/core.c \
+	control/error.c \
 	control/log.c \
 	control/playlist.c \
 	control/vlm.c \
-	control/input.c \
 	control/video.c \
 	control/audio.c \
-	control/mediacontrol_internal.h \
-	control/mediacontrol_core.c \
-	control/mediacontrol_util.c \
-	control/mediacontrol_audio_video.c
-
-if !USE_LIBTOOL
-if !HAVE_WIN32
-nodist_libvlc_a_SOURCES = misc/version.c
-CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-	$(TOOLBOX) --update-version
-endif
-
-# Install shared libvlc
-install-exec-local:
-	test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
-
-# the opposite of install-{data,exec}-local
-uninstall-local:
-	test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
-endif
+	control/event.c \
+	control/event_async.c \
+	control/media.c \
+	control/media_player.c \
+	control/media_list.c \
+	control/media_list_path.h \
+	control/media_list_player.c \
+	control/media_library.c \
+	control/media_discoverer.c
 
 ###############################################################################
-# Stamp rules
+# GIT revision
 ###############################################################################
 
-if !USE_LIBTOOL
-if !HAVE_WIN32
-stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
-	( cd $(srcdir) && cat $(HEADERS_include) ) | \
-	  top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
-	touch stamp-api
+BUILT_SOURCES += stamp-revision
+CLEANFILES += revision.txt revision.c
 
-CLEANFILES += stamp-api
-endif
-endif
+revision.c: revision.txt
+	$(AM_V_at)rm -f -- revision.c
+	$(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
+		> revision.c
+
+revision.txt: Makefile.am
+	$(AM_V_at)$(MAKE) stamp-revision
+	$(AM_V_GEN)touch revision.txt
+
+stamp-revision:
+	$(AM_V_at)rm -f -- revision.tmp
+	$(AM_V_GEN)(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
+		--match '?.*.*' --always || echo exported) > revision.tmp
+	$(AM_V_at)if diff revision.tmp revision.txt >/dev/null 2>&1; then \
+		rm -f -- revision.tmp; \
+	else \
+		mv -f -- revision.tmp revision.txt; \
+	fi 2>&1
 
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-if USE_LIBTOOL
-check_PROGRAMS = test_i18n_atof test_url test_utf8
-TESTS = $(check_PROGRAMS)
-endif
-
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
-test_i18n_atof_SOURCES = test/i18n_atof.c
-test_i18n_atof_LDADD = libvlc.la
-test_i18n_atof_CFLAGS = $(CFLAGS_tests)
-
-test_url_SOURCES = test/url.c
-test_url_LDADD = libvlc.la
-test_url_CFLAGS = $(CFLAGS_tests)
-
-test_utf8_SOURCES = test/utf8.c
-test_utf8_LDADD = libvlc.la
-test_utf8_CFLAGS = $(CFLAGS_tests)
+dist_check_SCRIPTS = check_symbols check_headers
+TESTS = check_symbols
+
+check_DATA = libvlc-headers.sym libvlc-sorted.sym
+CLEANFILES += $(check_DATA)
+
+libvlc-sorted.sym: libvlccore.sym
+	rm -f libvlc-sorted.sym
+	sort -fdu < "$(srcdir)/libvlccore.sym" > libvlc-sorted.sym
+
+libvlc-headers.sym:
+	rm -f libvlc-headers.sym
+	cat ${srcdir}/../include/vlc_*.h ${srcdir}/control/*.h | \
+	sed -n -e 's/^[ ]*VLC_EXPORT[ ]*([^,]*,\([^,]*\),.*/\1/p' | \
+	sed -e 's/[^a-zA-Z0-9_]*//' | \
+	sort -fdu > libvlc-headers.sym
+
+.PHONY: libvlc-headers.sym
+
+check-local:
+	for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \
+	do \
+		echo grep - "#include <$$h>" $(srcdir)/test/headers.c ; \
+		if ! grep -- "#include <$$h>" $(srcdir)/test/headers.c ; \
+		then \
+			echo "Header $$h not included in test/headers.c!"; \
+			exit 1; \
+		fi ; \
+	done
+	$(srcdir)/check_headers $(pkginclude_HEADERS)
+	$(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
+	@echo "Generated source cannot be phony. Go away." >&2
+	@exit 1
+
+.PHONY: FORCE