X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=e200669dc29704a3b45a5e916427b60bc0f3ce55;hb=062267bf2dea5bb919d09ab6b16472445854961b;hp=93cb0d11170109fb12c4c4f3ce34630476b2f964;hpb=bac71d2759727a7cf198e8241a345cfa2b6dbd9a;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 93cb0d1117..e200669dc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@
 ###############################################################################
 
 AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = . test
 
 NULL =
 EXTRA_DIST = \
@@ -24,12 +23,10 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
-	../include/vlc_acl.h \
+	../include/vlc_addons.h \
 	../include/vlc_aout.h \
-	../include/vlc_aout_intf.h \
-	../include/vlc_aout_mixer.h \
+	../include/vlc_aout_volume.h \
 	../include/vlc_arrays.h \
-	../include/vlc_art_finder.h \
 	../include/vlc_atomic.h \
 	../include/vlc_avcodec.h \
 	../include/vlc_bits.h \
@@ -59,11 +56,14 @@ pluginsinclude_HEADERS = \
 	../include/vlc_inhibit.h \
 	../include/vlc_input.h \
 	../include/vlc_input_item.h \
+	../include/vlc_keys.h \
 	../include/vlc_main.h \
 	../include/vlc_md5.h \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
+	../include/vlc_meta_fetcher.h \
 	../include/vlc_media_library.h \
+	../include/vlc_mime.h \
 	../include/vlc_modules.h \
 	../include/vlc_mouse.h \
 	../include/vlc_mtime.h \
@@ -77,7 +77,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_probe.h \
 	../include/vlc_rand.h \
 	../include/vlc_services_discovery.h \
-	../include/vlc_sql.h \
+	../include/vlc_fingerprinter.h \
 	../include/vlc_sout.h \
 	../include/vlc_spu.h \
 	../include/vlc_stream.h \
@@ -107,9 +107,7 @@ noinst_HEADERS = \
 	../include/vlc_interface.h \
 	../include/vlc_intf_strings.h \
 	../include/vlc_iso_lang.h \
-	../include/vlc_keys.h \
 	../include/vlc_memory.h \
-	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
@@ -165,36 +163,49 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 
 lib_LTLIBRARIES = libvlccore.la
 
-AM_CPPFLAGS = $(INCICONV) \
-	-DMODULE_STRING=\"main\" \
+AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
+	-DMODULE_STRING=\"core\" \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATA_PATH=\"$(vlcdatadir)\" \
+	-DPKGDATADIR=\"$(vlcdatadir)\" \
 	-DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)
+if HAVE_DYNAMIC_PLUGINS
+AM_CPPFLAGS += -DHAVE_DYNAMIC_PLUGINS
+endif
+if HAVE_DBUS
+AM_CPPFLAGS += -DHAVE_DBUS
+AM_CFLAGS += $(DBUS_CFLAGS)
+endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
 libvlccore_la_LDFLAGS = \
-	-no-undefined \
 	$(LDFLAGS_libvlccore) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 5:0:0
+	-version-info 8:0:0
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
+	../compat/libcompat.la \
 	$(LTLIBINTL) $(LTLIBICONV) \
-	$(SOCKET_LIBS) $(LIBDL) $(LIBM) \
-	../compat/libcompat.la
+	$(IDN_LIBS) $(LIBPTHREAD) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
-libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version \
+						 -Wc,--static -Wc,-static-libgcc
+endif
+if HAVE_OS2
+libvlccore_la_LDFLAGS += -avoid-version
+endif
+if HAVE_DBUS
+libvlccore_la_LIBADD += $(DBUS_LIBS)
 endif
 
 libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+	$(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_darwin) \
+	$(SOURCES_libvlc_android) \
 	$(SOURCES_libvlc_linux) \
 	$(SOURCES_libvlc_win32) \
 	$(SOURCES_libvlc_os2) \
@@ -206,15 +217,15 @@ EXTRA_libvlccore_la_SOURCES = \
 if HAVE_DARWIN
 libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
 else
+if HAVE_ANDROID
+libvlccore_la_SOURCES += $(SOURCES_libvlc_android)
+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
 if HAVE_SYMBIAN
 #libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian)
 else
@@ -239,33 +250,51 @@ endif
 endif
 
 SOURCES_libvlc_darwin = \
-	posix/darwin_dirs.c \
-	misc/atomic.c \
+	darwin/dirs.c \
 	posix/filesystem.c \
 	posix/plugin.c \
-	network/poll.c \
-	posix/thread.c \
-	posix/darwin_specific.c \
+	darwin/thread.c \
+	posix/timer.c \
+	darwin/specific.c \
+	posix/rand.c \
+	darwin/error.c \
+	darwin/netconf.c \
+	$(NULL)
+
+SOURCES_libvlc_android = \
+	android/dirs.c \
+	android/thread.c \
+	android/error.c \
+	posix/filesystem.c \
+	android/netconf.c \
+	posix/plugin.c \
+	posix/timer.c \
+	posix/linux_cpu.c \
+	posix/linux_specific.c \
+	posix/specific.c \
 	posix/rand.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
 	posix/dirs.c \
-	misc/atomic.c \
+	posix/error.c \
 	posix/filesystem.c \
+	posix/netconf.c \
 	posix/plugin.c \
-	network/poll.c \
 	posix/thread.c \
+	posix/timer.c \
+	posix/linux_cpu.c \
 	posix/linux_specific.c \
+	posix/specific.c \
 	posix/rand.c \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
 	win32/dirs.c \
-	win32/atomic.c \
+	win32/error.c \
 	win32/filesystem.c \
+	win32/netconf.c \
 	win32/plugin.c \
-	win32/poll.c \
 	win32/thread.c \
 	win32/specific.c \
 	win32/winsock.c \
@@ -275,7 +304,6 @@ SOURCES_libvlc_win32 = \
 SOURCES_libvlc_symbian = \
 	symbian/path.cpp \
 	symbian/dirs.c \
-	misc/atomic.c \
 	win32/plugin.c \
 	posix/rand.c \
 	$(NULL)
@@ -283,10 +311,10 @@ SOURCES_libvlc_symbian = \
 SOURCES_libvlc_os2 = \
 	os2/getaddrinfo.c \
 	os2/dirs.c \
-	misc/atomic.c \
-	posix/filesystem.c \
-	posix/plugin.c \
-	os2/poll.c \
+	darwin/error.c \
+	os2/filesystem.c \
+	os2/netconf.c \
+	os2/plugin.c \
 	os2/thread.c \
 	os2/specific.c \
 	os2/rand.c \
@@ -294,10 +322,12 @@ SOURCES_libvlc_os2 = \
 
 SOURCES_libvlc_other = \
 	posix/dirs.c \
-	misc/atomic.c \
+	posix/error.c \
 	posix/filesystem.c \
-	network/poll.c \
+	posix/netconf.c \
 	posix/thread.c \
+	posix/timer.c \
+	posix/plugin.c \
 	posix/specific.c \
 	posix/rand.c \
 	$(NULL)
@@ -314,6 +344,7 @@ SOURCES_libvlc_common = \
 	playlist/playlist_internal.h \
 	playlist/art.c \
 	playlist/art.h \
+	playlist/aout.c \
 	playlist/thread.c \
 	playlist/control.c \
 	playlist/engine.c \
@@ -375,14 +406,13 @@ SOURCES_libvlc_common = \
 	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/video_text.c \
 	video_output/video_epg.c \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
 	video_output/window.c \
+	video_output/window.h \
 	video_output/opengl.c \
 	video_output/vout_intf.c \
 	video_output/vout_internal.h \
@@ -392,13 +422,8 @@ SOURCES_libvlc_common = \
 	audio_output/common.c \
 	audio_output/dec.c \
 	audio_output/filters.c \
-	audio_output/input.c \
-	audio_output/mixer.c \
 	audio_output/output.c \
-	audio_output/intf.c \
-	osd/osd.c \
-	osd/osd_text.c \
-	network/acl.c \
+	audio_output/volume.c \
 	network/getaddrinfo.c \
 	network/io.c \
 	network/tcp.c \
@@ -408,6 +433,7 @@ SOURCES_libvlc_common = \
 	text/charset.c \
 	text/strings.c \
 	text/unicode.c \
+	text/url.c \
 	text/filesystem.c \
 	text/iso_lang.c \
 	text/iso-639_def.h \
@@ -439,12 +465,12 @@ SOURCES_libvlc_common = \
 	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/mime.c \
 	misc/objects.c \
 	misc/variables.h \
 	misc/variables.c \
@@ -453,13 +479,14 @@ SOURCES_libvlc_common = \
 	misc/update.c \
 	misc/update_crypto.c \
 	misc/xml.c \
-	misc/media_library.c \
 	extras/libc.c \
 	extras/tdestroy.c \
+	misc/addons.c \
 	misc/filter.c \
 	misc/filter_chain.c \
 	misc/http_auth.c \
-	misc/sql.c \
+	misc/httpcookies.c \
+	misc/fingerprinter.c \
 	misc/text_style.c \
 	misc/subpicture.c \
 	misc/subpicture.h \
@@ -472,7 +499,6 @@ SOURCES_libvlc_httpd = \
 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)
@@ -487,6 +513,40 @@ SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
 	$(NULL)
 
+# Unit/regression tests
+#
+check_PROGRAMS = \
+	test_block \
+	test_dictionary \
+	test_i18n_atof \
+	test_md5 \
+	test_picture_pool \
+	test_timer \
+	test_url \
+	test_utf8 \
+	test_xmlent \
+	test_headers
+
+TESTS = $(check_PROGRAMS)
+
+test_block_SOURCES = test/block_test.c
+test_block_LDADD = $(LDADD) $(LIBS_libvlccore)
+test_block_DEPENDENCIES =
+
+test_dictionary_SOURCES = test/dictionary.c
+test_i18n_atof_SOURCES = test/i18n_atof.c
+test_md5_SOURCES = test/md5.c
+test_picture_pool_SOURCES = test/picture_pool.c
+test_timer_SOURCES = test/timer.c
+test_url_SOURCES = test/url.c
+test_utf8_SOURCES = test/utf8.c
+test_xmlent_SOURCES = test/xmlent.c
+test_headers_SOURCES = test/headers.c
+
+AM_LDFLAGS = -no-install
+LDADD = libvlccore.la \
+	../compat/libcompat.la
+
 ###############################################################################
 # GIT revision
 ###############################################################################
@@ -533,7 +593,7 @@ check-local:
 			exit 1; \
 		fi ; \
 	done
-	$(srcdir)/check_headers $(pluginsinclude_HEADERS)
+	$(SHELL) $(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2