X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=afe3101dda239aced73e1cd0991f5b8e5ee27474;hb=f79f2b1f5bcd38dc33520220f72143a91202b1d5;hp=aefa6ce3c62ffea47b7ba8b271368eba4cbc91e3;hpb=8e18f5c6cdc3d3dba06a3e04d1f460ee694634a4;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index aefa6ce3c6..afe3101dda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,12 +3,15 @@
 ###############################################################################
 
 AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = . test
 
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
-	vlc-control.pc.in \
+	misc/beos_specific.cpp \
+	libvlc.pc.in \
 	vlc-plugin.pc.in \
-	libvlc.sym
+	libvlc.sym \
+	libvlccore.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -24,7 +27,6 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pkginclude_HEADERS = \
 	../include/vlc/vlc.h \
-	../include/vlc/common.h \
 	../include/vlc/deprecated.h \
 	../include/vlc/libvlc.h \
 	../include/vlc/libvlc_structures.h \
@@ -36,70 +38,70 @@ pkginclude_HEADERS = \
 	$(NULL)
 
 pluginsinclude_HEADERS = \
-	../include/vlc_arrays.h \
-	../include/vlc_common.h \
-	../include/vlc_config.h \
-	../include/vlc_configuration.h \
-	../include/vlc_main.h \
-	../include/vlc_messages.h \
-	../include/vlc_modules.h \
-	../include/vlc_mtime.h \
-	../include/vlc_objects.h \
-	../include/vlc_plugin.h \
-	../include/vlc_threads.h \
-	../include/vlc_variables.h \
-	$(NULL)
-
-noinst_HEADERS = \
-	../include/iso_lang.h \
-	../include/mmx.h \
 	../include/vlc_access.h \
 	../include/vlc_acl.h \
 	../include/vlc_aout.h \
+	../include/vlc_arrays.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
 	../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_config_cat.h \
+	../include/vlc_configuration.h \
 	../include/vlc_demux.h \
-	../include/vlc_devices.h \
 	../include/vlc_epg.h \
 	../include/vlc_es.h \
 	../include/vlc_es_out.h \
 	../include/vlc_events.h \
 	../include/vlc_filter.h \
-	../include/vlc_fixups.h \
 	../include/vlc_gcrypt.h \
 	../include/vlc_httpd.h \
 	../include/vlc_image.h \
 	../include/vlc_input.h \
-	../include/vlc_interface.h \
-	../include/vlc_intf_strings.h \
-	../include/vlc_keys.h \
+	../include/vlc_main.h \
 	../include/vlc_md5.h \
+	../include/vlc_messages.h \
 	../include/vlc_meta.h \
-	../include/vlc_network.h \
-	../include/vlc_osd.h \
-	../include/vlc_pgpkey.h \
+	../include/vlc_modules.h \
+	../include/vlc_mtime.h \
+	../include/vlc_objects.h \
 	../include/vlc_playlist.h \
+	../include/vlc_plugin.h \
 	../include/vlc_rand.h \
 	../include/vlc_services_discovery.h \
 	../include/vlc_sout.h \
 	../include/vlc_stream.h \
-	../include/vlc_streaming.h \
 	../include/vlc_strings.h \
-	../include/vlc_tls.h \
-	../include/vlc_update.h \
+	../include/vlc_threads.h \
 	../include/vlc_url.h \
+	../include/vlc_variables.h \
 	../include/vlc_vlm.h \
-	../include/vlc_vod.h \
 	../include/vlc_vout.h \
+	../include/vlc_window.h \
 	../include/vlc_xml.h \
 	$(NULL)
 
+noinst_HEADERS = \
+	../include/mmx.h \
+	../include/vlc_codec_synchro.h \
+	../include/vlc_codecs.h \
+	../include/vlc_devices.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_network.h \
+	../include/vlc_osd.h \
+	../include/vlc_pgpkey.h \
+	../include/vlc_tls.h \
+	../include/vlc_update.h \
+	../include/vlc_vod.h \
+	$(NULL)
+
 modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
 	rm -f -- "$@.tmp"
 	cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
@@ -145,7 +147,7 @@ modules/modules.c: modules/builtin.h
 ###############################################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vlc-control.pc vlc-plugin.pc
+pkgconfig_DATA = libvlc.pc vlc-plugin.pc
 CLEANFILES += $(pkgconfig_DATA)
 
 .pc.in.pc: $(top_builddir)/config.status
@@ -159,47 +161,50 @@ CLEANFILES += $(pkgconfig_DATA)
 nice:
 	$(top_builddir)/compile
 
-lib_LTLIBRARIES = libvlc.la libvlc-control.la
+lib_LTLIBRARIES = libvlccore.la libvlc.la
 
-AM_LDFLAGS = -no-undefined -no-install
+AM_LDFLAGS = -no-undefined
 if HAVE_WIN32
 AM_LDFLAGS += -avoid-version
 endif
 
-libvlc_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+libvlccore_la_SOURCES = $(SOURCES_libvlc)
+nodist_libvlccore_la_SOURCES = misc/revision.c
+libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
 	-DMODULE_STRING=\"main\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(pkgdatadir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPLUGIN_PATH=\"$(pkglibdir)\"
-libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
-libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+	-export-symbols $(srcdir)/libvlccore.sym \
 	-version-info 1:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_la_LDFLAGS += -export-dynamic
-else
-libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym 
+libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
+libvlccore_la_DEPENDENCIES = libvlccore.sym
+if HAVE_WIN32
+libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
-libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 
-libvlc_la_DEPENDENCIES = libvlc.sym
+libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
-libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_control_la_LIBADD = libvlc.la
-libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+libvlc_la_SOURCES = $(SOURCES_libvlc_control)
+libvlc_la_LIBADD = libvlccore.la
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
 	-DMODULE_STRING=\"control\"
-libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_control_la_LDFLAGS += -export-dynamic
-else
-libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
+	-version-info 2:2:0 \
+	-export-symbols $(srcdir)/libvlc.sym
+libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
+if HAVE_WIN32
+libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
+libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
 endif
 
-EXTRA_libvlc_la_SOURCES = \
+
+EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_beos) \
 	$(SOURCES_libvlc_darwin) \
 	$(SOURCES_libvlc_linux) \
@@ -208,40 +213,43 @@ EXTRA_libvlc_la_SOURCES = \
 	$(SOURCES_libvlc_dirent) \
 	$(SOURCES_libvlc_getopt) \
 	$(SOURCES_libvlc_sout) \
+	$(SOURCES_libvlc_vlm) \
 	$(NULL)
 if HAVE_BEOS
-libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
 else
 if HAVE_DARWIN
-libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
 else
 if HAVE_LINUX
-libvlc_la_SOURCES += $(SOURCES_libvlc_linux)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
 else
 if HAVE_WIN32
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
 else
 if HAVE_WINCE
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
 else
-libvlc_la_SOURCES += $(SOURCES_libvlc_other)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
 endif
 endif
 endif
 endif
 endif
 if BUILD_DIRENT
-libvlc_la_SOURCES += $(SOURCES_libvlc_dirent)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
 endif
 if BUILD_GETOPT
-libvlc_la_SOURCES += $(SOURCES_libvlc_getopt)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
 if ENABLE_SOUT
-libvlc_la_SOURCES += $(SOURCES_libvlc_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 \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
@@ -271,9 +279,9 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
 	libvlc.c \
-	libvlc-common.c \
 	libvlc.h \
 	libvlc-module.c \
+	version.c \
 	interface/interface.h \
 	interface/interface.c \
 	interface/intf_eject.c \
@@ -298,6 +306,8 @@ SOURCES_libvlc_common = \
 	input/es_out.c \
 	input/input.c \
 	input/meta.c \
+	input/input_clock.h \
+	input/input_decoder.h \
 	input/input_internal.h \
 	input/vlm_internal.h \
 	input/stream.c \
@@ -311,6 +321,7 @@ SOURCES_libvlc_common = \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
 	video_output/vout_intf.c \
+	video_output/vout_internal.h \
 	audio_output/aout_internal.h \
 	audio_output/common.c \
 	audio_output/dec.c \
@@ -328,7 +339,7 @@ SOURCES_libvlc_common = \
 	network/tcp.c \
 	network/udp.c \
 	network/httpd.c \
-	network/rootwrap.c \
+	network/rootbind.c \
 	network/tls.c \
 	network/poll.c \
 	text/charset.c \
@@ -341,6 +352,7 @@ SOURCES_libvlc_common = \
 	misc/rand.c \
 	misc/mtime.c \
 	misc/block.c \
+	misc/es_format.c \
 	modules/modules.h \
 	modules/modules.c \
 	modules/cache.c \
@@ -352,6 +364,7 @@ SOURCES_libvlc_common = \
 	misc/action.c \
 	config/configuration.h \
 	config/core.c \
+	config/dirs.c \
 	config/chain.c \
 	config/file.c \
 	config/intf.c \
@@ -363,23 +376,27 @@ SOURCES_libvlc_common = \
 	misc/variables.h \
 	misc/variables.c \
 	misc/error.c \
+	misc/update.h \
 	misc/update.c \
 	misc/xml.c \
 	misc/devices.c \
 	extras/libc.c \
+	misc/filter_chain.c \
 	$(NULL)
 
 SOURCES_libvlc_sout = \
-	input/vlm.c \
-	input/vlmshell.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 \
 	$(NULL)
 
+SOURCES_libvlc_vlm = \
+	input/vlm.c \
+	input/vlmshell.c \
+	$(NULL)
+
 SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
 	$(OPT_SOURCES_libvlc_beos) \
@@ -419,84 +436,19 @@ SOURCES_libvlc_control = \
 ###############################################################################
 
 misc/revision.c:
-	rm -f $@ $@.tmp
+	rm -f -- $@ $@.tmp
 	echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-	REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
-	REVISION="$$(echo $$REVISION|cut -b -10)"; \
+	REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo exported)"; \
 	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
-	mv -f $@.tmp $@
+	mv -f -- $@.tmp $@
 
 
-###############################################################################
-# Building vlc
-###############################################################################
-
-if BUILD_VLC
-bin_PROGRAMS = vlc
-endif
-
-vlc_SOURCES = vlc.c
-vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
-
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
-
-if BUILD_VLC
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
-	@rm -f vlc$(EXEEXT)
-	@case `$(VLC_CONFIG) --linkage vlc builtin` in \
-	  c++) cmd="$(CXXLINK)" ;; \
-	  objc) cmd="$(OBJCLINK)" ;; \
-	  c|*) cmd="$(LINK)" ;; \
-	esac ; \
-	cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
-	echo $$cmd ; \
-	eval $$cmd
-
-if HAVE_WIN32
-DATA_win32_rc = $(noinst_DATA)
-noinst_DATA = vlc_win32_rc.$(OBJEXT)
-
-vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc
-	$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(top_srcdir)/share -i $< -o $@
-endif
-endif
-
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-check_PROGRAMS = \
-	test_dictionary \
-	test_i18n_atof \
-	test_url \
-	test_utf8 \
-	test_headers \
-	$(NULL)
 
 dist_check_SCRIPTS = check_symbols check_headers
-TESTS = $(check_PROGRAMS) check_symbols
-
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
-
-test_dictionary_SOURCES = test/dictionary.c
-test_dictionary_LDADD = libvlc.la
-test_dictionary_CFLAGS = $(CFLAGS_tests)
-
-test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.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)
-
-test_headers_SOURCES = test/headers.c
-test_headers_CFLAGS = $(CFLAGS_tests)
+TESTS = check_symbols
 
 check-local:
 	for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \
@@ -509,8 +461,7 @@ check-local:
 		fi ; \
 	done
 	$(srcdir)/check_headers $(pkginclude_HEADERS)
-# Hmm, this test should not fail:
-	-$(srcdir)/check_headers $(pluginsinclude_HEADERS)
+	$(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2