X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=663351e8392101dd108d93a4ac8e93148333fd83;hb=f8e940016f9d710ebfafe8e3898fe591dd9c76c2;hp=cd5f5a5f7f1c601ab4f001374b45d9e3e1ebbc50;hpb=45a540ed0cdd265c4f637d126fbd64fcc88cbc8f;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index cd5f5a5f7f..663351e839 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,20 +3,14 @@
 ###############################################################################
 
 AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = . test
 
 NULL =
 EXTRA_DIST = \
-	libvlc.pc.in \
 	vlc-plugin.pc.in \
-	libvlc.sym \
 	libvlccore.sym \
-	revision.txt \
-	../include/vlc/libvlc_version.h.in
+	revision.txt
 
-BUILT_SOURCES = \
-	$(nodist_pkginclude_HEADERS) \
-	$(nodist_pluginsinclude_HEADERS)
+BUILT_SOURCES = $(nodist_pluginsinclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc .rc.in .rc
@@ -27,28 +21,10 @@ SUFFIXES = .pc.in .pc .rc.in .rc
 
 pluginsincludedir = $(pkgincludedir)/plugins
 
-pkginclude_HEADERS = \
-	../include/vlc/vlc.h \
-	../include/vlc/deprecated.h \
-	../include/vlc/libvlc.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
-
 pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
-	../include/vlc_acl.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 \
@@ -80,14 +56,17 @@ 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_media_library.h \
+	../include/vlc_mime.h \
 	../include/vlc_modules.h \
 	../include/vlc_mouse.h \
 	../include/vlc_mtime.h \
+	../include/vlc_network.h \
 	../include/vlc_objects.h \
 	../include/vlc_picture.h \
 	../include/vlc_picture_fifo.h \
@@ -105,6 +84,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_subpicture.h \
 	../include/vlc_text_style.h \
 	../include/vlc_threads.h \
+	../include/vlc_tls.h \
 	../include/vlc_url.h \
 	../include/vlc_variables.h \
 	../include/vlc_vlm.h \
@@ -126,22 +106,15 @@ 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_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)
 
-../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
@@ -164,7 +137,7 @@ noinst_HEADERS = \
 ###############################################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvlc.pc vlc-plugin.pc
+pkgconfig_DATA = vlc-plugin.pc
 CLEANFILES += $(pkgconfig_DATA)
 
 .pc.in.pc: $(top_builddir)/config.status
@@ -188,57 +161,51 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 # Building libvlc
 ###############################################################################
 
-lib_LTLIBRARIES = libvlccore.la libvlc.la
+lib_LTLIBRARIES = libvlccore.la
 
-AM_LDFLAGS = -no-undefined
-if HAVE_WIN32
-AM_LDFLAGS += -avoid-version
+AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
+	-DMODULE_STRING=\"main\" \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DPKGDATADIR=\"$(vlcdatadir)\" \
+	-DPKGLIBDIR=\"$(vlclibdir)\"
+AM_CFLAGS = $(CFLAGS_libvlccore)
+if HAVE_DYNAMIC_PLUGINS
+AM_CPPFLAGS += -DHAVE_DYNAMIC_PLUGINS
 endif
-if HAVE_WINCE
-AM_LDFLAGS += -avoid-version
+if HAVE_DBUS
+AM_CPPFLAGS += -DHAVE_DBUS
+AM_CFLAGS += $(DBUS_CFLAGS)
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-libvlccore_la_CFLAGS = $(CFLAGS_libvlccore) \
-	-DMODULE_STRING=\"main\" \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATA_PATH=\"$(vlcdatadir)\" \
-	-DPKGLIBDIR=\"$(vlclibdir)\"
-libvlccore_la_LDFLAGS = $(LDFLAGS_libvlccore) $(AM_LDFLAGS) \
+libvlccore_la_LDFLAGS = \
+	-no-undefined \
+	$(LDFLAGS_libvlccore) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
 	-version-info 5:0:0
-libvlccore_la_LIBADD = $(LIBS_libvlccore) $(AM_LIBADD) \
-	$(LTLIBINTL) ../compat/libcompat.la
+libvlccore_la_LIBADD = $(LIBS_libvlccore) \
+	../compat/libcompat.la \
+	$(LTLIBINTL) $(LTLIBICONV) \
+	$(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)
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
 endif
-
-libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
-
-libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_la_LIBADD = $(LIBS_libvlc) \
-	libvlccore.la ../compat/libcompat.la
-libvlc_la_CPPFLAGS = -DMODULE_STRING=\"libvlc\"
-libvlc_la_CFLAGS = $(CFLAGS_libvlc)
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_libvlc) \
-	-version-info 6:0:1 \
-	-export-symbols $(srcdir)/libvlc.sym
-libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
-if HAVE_WIN32
-libvlc_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
-libvlc_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
+if HAVE_DBUS
+libvlccore_la_LIBADD += $(DBUS_LIBS)
 endif
 
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
+	$(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) \
 	$(SOURCES_libvlc_other) \
 	$(SOURCES_libvlc_httpd) \
 	$(SOURCES_libvlc_sout) \
@@ -247,24 +214,28 @@ 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
+if HAVE_OS2
+libvlccore_la_SOURCES += $(SOURCES_libvlc_os2)
+else
 libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
 endif
 endif
 endif
 endif
 endif
+endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -277,49 +248,73 @@ endif
 
 SOURCES_libvlc_darwin = \
 	posix/darwin_dirs.c \
-	misc/atomic.c \
 	posix/filesystem.c \
 	posix/plugin.c \
-	network/poll.c \
 	posix/thread.c \
+	posix/timer.c \
 	posix/darwin_specific.c \
+	posix/rand.c \
+	$(NULL)
+
+SOURCES_libvlc_android = \
+	android/dirs.c \
+	android/thread.c \
+	posix/filesystem.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/filesystem.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/filesystem.c \
 	win32/plugin.c \
-	win32/poll.c \
 	win32/thread.c \
 	win32/specific.c \
 	win32/winsock.c \
+	win32/rand.c \
 	$(NULL)
 
 SOURCES_libvlc_symbian = \
 	symbian/path.cpp \
 	symbian/dirs.c \
-	misc/atomic.c \
 	win32/plugin.c \
+	posix/rand.c \
+	$(NULL)
+
+SOURCES_libvlc_os2 = \
+	os2/getaddrinfo.c \
+	os2/dirs.c \
+	os2/filesystem.c \
+	os2/plugin.c \
+	os2/thread.c \
+	os2/specific.c \
+	os2/rand.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
 	posix/dirs.c \
-	misc/atomic.c \
 	posix/filesystem.c \
-	network/poll.c \
 	posix/thread.c \
+	posix/timer.c \
+	posix/plugin.c \
 	posix/specific.c \
+	posix/rand.c \
 	$(NULL)
 
 SOURCES_libvlc_common = \
@@ -331,10 +326,10 @@ SOURCES_libvlc_common = \
 	version.c \
 	interface/dialog.c \
 	interface/interface.c \
-	interface/intf_eject.c \
 	playlist/playlist_internal.h \
 	playlist/art.c \
 	playlist/art.h \
+	playlist/aout.c \
 	playlist/thread.c \
 	playlist/control.c \
 	playlist/engine.c \
@@ -376,6 +371,7 @@ SOURCES_libvlc_common = \
 	input/vlm_event.h \
 	input/resource.h \
 	input/resource.c \
+	input/stats.c \
 	input/stream.c \
 	input/stream_demux.c \
 	input/stream_filter.c \
@@ -413,12 +409,10 @@ SOURCES_libvlc_common = \
 	audio_output/dec.c \
 	audio_output/filters.c \
 	audio_output/input.c \
-	audio_output/mixer.c \
 	audio_output/output.c \
-	audio_output/intf.c \
+	audio_output/volume.c \
 	osd/osd.c \
 	osd/osd_text.c \
-	network/acl.c \
 	network/getaddrinfo.c \
 	network/io.c \
 	network/tcp.c \
@@ -428,6 +422,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 \
@@ -448,7 +443,6 @@ SOURCES_libvlc_common = \
 	modules/entry.c \
 	modules/textdomain.c \
 	misc/threads.c \
-	misc/stats.c \
 	misc/cpu.c \
 	misc/epg.c \
 	misc/exit.c \
@@ -456,15 +450,16 @@ SOURCES_libvlc_common = \
 	config/core.c \
 	config/chain.c \
 	config/file.c \
+        config/help.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/mime.c \
 	misc/objects.c \
 	misc/variables.h \
 	misc/variables.c \
@@ -507,48 +502,44 @@ SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
 	$(NULL)
 
-SOURCES_libvlc_control = \
-	revision.c \
-	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/video.c \
-	control/audio.c \
-	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
-
-###############################################################################
-# libvlc pulse
-###############################################################################
-
-if HAVE_PULSE
-pkglib_LTLIBRARIES = libvlcpulse.la
-endif
-
-libvlcpulse_la_SOURCES = pulse/mainloop.c ../include/vlc_pulse.h
-libvlcpulse_la_CPPFLAGS = $(PULSE_CFLAGS)
-libvlcpulse_la_LIBADD = $(PULSE_LIBS) libvlccore.la
-libvlcpulse_la_LDFLAGS = -export-symbols-regex ^vlc_pa_ -no-undefined
+# Unit/regression tests
+#
+check_PROGRAMS = \
+	test_block \
+	test_dictionary \
+	test_i18n_atof \
+	test_md5 \
+	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_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
 ###############################################################################
 
 BUILT_SOURCES += stamp-revision
+MAINTAINERCLEANFILES = $(srcdir)/revision.txt $(srcdir)/revision.c
 
 $(srcdir)/revision.c: $(srcdir)/revision.txt
 	$(AM_V_at)rm -f -- $@
@@ -589,8 +580,7 @@ check-local:
 			exit 1; \
 		fi ; \
 	done
-	$(srcdir)/check_headers $(pkginclude_HEADERS)
-	$(srcdir)/check_headers $(pluginsinclude_HEADERS)
+	$(SHELL) $(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2