X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=fd718cad437ffcf90719b84449624c0f31f8eac5;hb=6a1516cc5df7eea5a09a845511cb3a99ceb0a646;hp=494aca4077c92cebe2a62cb5303861defd53d818;hpb=473906a052f21523a3fe450f4664f247f72b3d9e;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 494aca4077..fd718cad43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,12 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym vlc-control.pc.in
+EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+	misc/beos_specific.cpp \
+	libvlc.pc.in \
+	vlc-plugin.pc.in \
+	libvlc.sym \
+	libvlccore.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -17,21 +22,21 @@ SUFFIXES = .pc.in .pc
 ###############################################################################
 
 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/libvlc_structures.h \
+	../include/vlc/libvlc_media_list.h \
+	../include/vlc/libvlc_events.h \
+	../include/vlc/libvlc_vlm.h \
 	../include/vlc/mediacontrol.h \
 	../include/vlc/mediacontrol_structures.h \
 	$(NULL)
 
-noinst_HEADERS = $(HEADERS_include)
-
-HEADERS_include = \
-	../include/iso_lang.h \
-	../include/main.h \
-	../include/mmx.h \
+pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
 	../include/vlc_acl.h \
 	../include/vlc_aout.h \
@@ -41,56 +46,61 @@ 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 \
 	../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_modules.h \
-	../include/vlc_modules_macros.h \
 	../include/vlc_mtime.h \
-	../include/vlc_network.h \
 	../include/vlc_objects.h \
-	../include/vlc_osd.h \
-	../include/vlc_pgpkey.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_threads.h \
-	../include/vlc_threads_funcs.h \
-	../include/vlc_tls.h \
-	../include/vlc_update.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"
@@ -136,13 +146,9 @@ 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)
 
-vlc-control.pc: vlc-control.pc.in $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	$(SHELL) ./config.status --file=src/vlc-control.pc
-
 .pc.in.pc: $(top_builddir)/config.status
 	cd "$(top_builddir)" && \
 	$(SHELL) ./config.status --file="src/$@"
@@ -154,80 +160,100 @@ vlc-control.pc: vlc-control.pc.in $(top_builddir)/config.status
 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) \
-	-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 1:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_control_la_LDFLAGS += -export-dynamic
-else
-libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
-endif
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+	-export-symbols $(srcdir)/libvlccore.sym \
+	-version-info 0:1:0
+libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
+libvlccore_la_DEPENDENCIES = libvlccore.sym
+
+libvlc_la_SOURCES = $(SOURCES_libvlc_control)
+libvlc_la_LIBADD = libvlccore.la
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+	-DMODULE_STRING=\"control\"
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
+	-version-info 2:1:0 \
+	-export-symbols $(srcdir)/libvlc.sym
+libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 
-EXTRA_libvlc_la_SOURCES = \
+EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_beos) \
 	$(SOURCES_libvlc_darwin) \
+	$(SOURCES_libvlc_linux) \
 	$(SOURCES_libvlc_win32) \
+	$(SOURCES_libvlc_other) \
 	$(SOURCES_libvlc_dirent) \
 	$(SOURCES_libvlc_getopt) \
+	$(SOURCES_libvlc_sout) \
+	$(SOURCES_libvlc_vlm) \
 	$(NULL)
 if HAVE_BEOS
-libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
-endif
+libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
+else
 if HAVE_DARWIN
-libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
-endif
+libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
+else
+if HAVE_LINUX
+libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
+else
 if HAVE_WIN32
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
-endif
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
+else
 if HAVE_WINCE
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
+else
+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
+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 = \
 	misc/darwin_specific.c \
 	$(NULL)
 
+SOURCES_libvlc_linux = \
+	misc/linux_specific.c \
+	$(NULL)
+
 SOURCES_libvlc_win32 = \
 	misc/win32_specific.c \
+	network/winsock.c \
 	$(NULL)
 
+SOURCES_libvlc_other = misc/not_specific.c
+
 SOURCES_libvlc_dirent = \
 	extras/dirent.c \
 	$(NULL)
@@ -240,9 +266,10 @@ 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 \
 	interface/interaction.c \
@@ -287,23 +314,16 @@ 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_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 \
@@ -324,8 +344,10 @@ SOURCES_libvlc_common = \
 	misc/threads.c \
 	misc/stats.c \
 	misc/cpu.c \
+	misc/action.c \
 	config/configuration.h \
 	config/core.c \
+	config/dirs.c \
 	config/chain.c \
 	config/file.c \
 	config/intf.c \
@@ -337,11 +359,25 @@ SOURCES_libvlc_common = \
 	misc/variables.h \
 	misc/variables.c \
 	misc/error.c \
+	misc/update.h \
 	misc/update.c \
-	input/vlm.c \
 	misc/xml.c \
 	misc/devices.c \
 	extras/libc.c \
+	misc/filter_chain.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/vlmshell.c \
 	$(NULL)
 
 SOURCES_libvlc = \
@@ -361,13 +397,12 @@ SOURCES_libvlc_control = \
 	control/vlm.c \
 	control/video.c \
 	control/audio.c \
-	control/dynamic_media_list.c \
 	control/event.c \
 	control/flat_media_list_view.c \
 	control/hierarchical_media_list_view.c \
 	control/hierarchical_node_media_list_view.c \
-	control/media_descriptor.c \
-	control/media_instance.c \
+	control/media.c \
+	control/media_player.c \
 	control/media_list.c \
 	control/media_list_path.h \
 	control/media_list_player.c \
@@ -377,8 +412,7 @@ SOURCES_libvlc_control = \
 	control/mediacontrol_core.c \
 	control/mediacontrol_util.c \
 	control/mediacontrol_audio_video.c \
-	control/media_discoverer.c \
-	control/tag_query.c
+	control/media_discoverer.c
 
 ###############################################################################
 # Stamp rules
@@ -387,7 +421,8 @@ SOURCES_libvlc_control = \
 misc/revision.c:
 	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) | cut -b -10)"; \
+	REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref --head -s HEAD 2>/dev/null || echo exported)"; \
+	REVISION="$$(echo $$REVISION|cut -b -10)"; \
 	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
 	mv -f $@.tmp $@
 
@@ -396,16 +431,29 @@ misc/revision.c:
 # Building vlc
 ###############################################################################
 
+EXTRA_PROGRAMS = vlc vlc-wrapper
 if BUILD_VLC
 bin_PROGRAMS = vlc
+if !HAVE_WIN32
+bin_PROGRAMS += vlc-wrapper
+endif
 endif
 
+EXTRA_vlc_SOURCES = vlc.c winvlc.c
+if !HAVE_WIN32
 vlc_SOURCES = vlc.c
+else
+vlc_SOURCES = winvlc.c
+endif
+vlc_wrapper_SOURCES = network/rootwrap.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`
+# vlc needs libvlccore for locale conversion
+vlc_LDADD = $(DATA_win32_rc) libvlc.la libvlccore.la $(LTLIBINTL) \
+	`$(VLC_CONFIG) -libs vlc`
 
 if BUILD_VLC
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@@ -432,44 +480,51 @@ endif
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
+	test_block \
 	test_dictionary \
 	test_i18n_atof \
 	test_url \
 	test_utf8 \
 	test_headers \
-	test_control \
 	$(NULL)
 
-dist_check_SCRIPTS = check_symbols
-TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
+dist_check_SCRIPTS = check_symbols check_headers
+TESTS = $(check_PROGRAMS) check_symbols
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
+LDFLAGS_tests = $(AM_LDFLAGS) -no-install
+
+test_block_SOURCES = test/block.c
+test_block_LDADD = libvlccore.la
+test_block_CFLAGS = $(CFLAGS_tests)
+test_block_LDFLAGS = $(LDFLAGS_tests)
 
 test_dictionary_SOURCES = test/dictionary.c
-test_dictionary_LDADD = libvlc.la
+test_dictionary_LDADD = libvlccore.la
 test_dictionary_CFLAGS = $(CFLAGS_tests)
+test_dictionary_LDFLAGS = $(LDFLAGS_tests)
 
 test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
-test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_LDADD = libvlccore.la
 test_i18n_atof_CFLAGS = $(CFLAGS_tests)
+test_i18n_atof_LDFLAGS = $(LDFLAGS_tests)
 
 test_url_SOURCES = test/url.c
-test_url_LDADD = libvlc.la
+test_url_LDADD = libvlccore.la
 test_url_CFLAGS = $(CFLAGS_tests)
+test_url_LDFLAGS = $(LDFLAGS_tests)
 
 test_utf8_SOURCES = test/utf8.c
-test_utf8_LDADD = libvlc.la
+test_utf8_LDADD = libvlccore.la
 test_utf8_CFLAGS = $(CFLAGS_tests)
+test_utf8_LDFLAGS = $(LDFLAGS_tests)
 
 test_headers_SOURCES = test/headers.c
 test_headers_CFLAGS = $(CFLAGS_tests)
-
-test_control_SOURCES = control/testapi.c
-test_control_LDADD = libvlc-control.la
-test_control_CFLAGS = $(CFLAGS_tests)
+test_headers_LDFLAGS = $(LDFLAGS_tests)
 
 check-local:
-	for h in `echo $(dist_pkginclude_HEADERS) $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \
+	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 ; \
@@ -478,6 +533,8 @@ check-local:
 			exit 1; \
 		fi ; \
 	done
+	$(srcdir)/check_headers $(pkginclude_HEADERS)
+	$(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2