X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=4dfa254cf45c0e02231f1b13801650f70f05a71b;hb=e219a0855762a9c0f6f28532d8c60ee2095142a9;hp=e28227f1593e8c162927b93f589638498f1c2528;hpb=6aa5b046329c07819c4f96a3b889a7155c357deb;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index e28227f159..4dfa254cf4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,14 +2,16 @@
 # Automake targets and declarations
 ###############################################################################
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
 SUBDIRS =
 
 EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
 BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
-DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h misc/version.c
+DISTCLEANFILES = stamp-api libvlc.sym
+CLEANFILES = misc/modules_builtin.h
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -55,9 +57,11 @@ HEADERS_include = \
 	../include/os_specific.h \
 	../include/snapshot.h \
 	../include/stream_output.h \
+	../include/vlc_streaming.h \
 	../include/variables.h \
 	../include/video_output.h \
 	../include/vlc_access.h \
+	../include/vlc_arrays.h \
 	../include/vlc_acl.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
@@ -75,10 +79,12 @@ HEADERS_include = \
 	../include/vlc_httpd.h \
 	../include/vlc_tls.h \
 	../include/vlc_md5.h \
+	../include/vlc_devices.h \
 	../include/vlc_image.h \
 	../include/vlc_input.h \
 	../include/vlc_interaction.h \
 	../include/vlc_interface.h \
+	../include/vlc_intf_strings.h \
 	../include/vlc_keys.h \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
@@ -87,10 +93,12 @@ HEADERS_include = \
 	../include/vlc_playlist.h \
 	../include/vlc_spu.h \
 	../include/vlc_stream.h \
+	../include/vlc_strings.h \
 	../include/vlc_symbols.h \
 	../include/vlc_threads_funcs.h \
 	../include/vlc_threads.h \
 	../include/vlc_update.h \
+	../include/vlc_url.h \
 	../include/vlc_video.h \
 	../include/vlc_vlm.h \
 	../include/vlc_vod.h \
@@ -107,9 +115,6 @@ misc/modules_builtin.h: Makefile misc/modules_builtin.h.in ../vlc-config
 
 misc/modules.c: misc/modules_builtin.h
 
-misc/version.c: FORCE
-	$(TOOLBOX) --update-version
-
 ###############################################################################
 # Building builtin modules
 ###############################################################################
@@ -119,67 +124,44 @@ misc/version.c: FORCE
 # shared object, which will make builtins fairly redumdant. Until then, we
 # need this workaround.
 
-stamp-builtins:
-if USE_LIBTOOL
-	@for c in `$(VLC_CONFIG) --libs builtin`; do \
-		case $$c in \
-        		../modules/*.a) echo $$c ;; \
-		esac ; \
-	done | \
-	sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
-	while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
-	sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2.la/g' | \
-	while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
-endif
+
 if BUILD_SHARED
-	@if test "$(pic)" = "pic"; then ext="_pic.a"; else ext=".a"; fi ; \
-	for c in `$(VLC_CONFIG) --libs builtin`; do \
+stamp-builtins: Makefile ../vlc-config ../config.status
+	@for c in `$(VLC_CONFIG) --libs builtin`; do \
 		case $$c in \
 			../modules/*.a) echo $$c ;; \
 		esac ; \
 	done | \
-	sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
-	while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
-endif
+	sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \
+	while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
 	touch $@
+endif
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-LIBRARIES_nopic = libvlc.a
-LIBRARIES_pic = libvlc_pic.a
-if HAVE_WIN32
-lib_LIBRARIES = $(LIBRARIES_nopic)
-else
-if BUILD_SHARED
-lib_LIBRARIES = $(LIBRARIES_pic)
-else
-lib_LIBRARIES = $(LIBRARIES_nopic)
-if BUILD_PIC
-lib_LIBRARIES += $(LIBRARIES_pic)
-endif
-endif
-endif
-
-libvlc_a_SOURCES = $(SOURCES_libvlc)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-
-libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
-libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
-libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
-libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
+libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
+nodist_libvlc_a_SOURCES = misc/version.c
+libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -DUSE_BUILTINS
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
+libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
+libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\.a /.la /g'` \
-		-avoid-version -no-undefined
-libvlc_la_DEPENDENCIES = stamp-builtins
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc` \
+	-no-undefined -export-symbols libvlc.sym -version-info 0: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 vlc`
+libvlc_control_la_LDFLAGS = \
+	-no-undefined -export-symbols-regex '_?(libvlc|mediacontrol)_.*' \
+	-version-info 0:0:0
 
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
@@ -202,31 +184,42 @@ endif
 
 # Build libvlc as a shared library
 if USE_LIBTOOL
-lib_LTLIBRARIES = libvlc.la
+lib_LTLIBRARIES = libvlc.la libvlc-control.la
+else
+lib_LIBRARIES = libvlc.a
 endif
-if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
+
 if HAVE_WIN32
-OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
-LDFLAGS_libvlc_so = -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a
+pic =
 else
-OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
+pic = pic
 endif
+
+if HAVE_WIN32
+if BUILD_SHARED
+DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
 endif
 
+libvlc.dll.a: libvlc$(LIBEXT)
+	$(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS)
+
 libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
-	@ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
+	@ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin pic` $(INCLUDED_LIBINTL)" ; \
 	case `$(VLC_CONFIG) --linkage vlc builtin` in \
 	  c++)  ld="$(CXXLINK)" ;; \
 	  objc) ld="$(OBJCLINK)" ;; \
 	  c|*)  ld="$(LINK)" ;; \
 	esac ; \
 	echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
-	$$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$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
+endif
 
 EXTRA_DIST += \
 	$(SOURCES_libvlc_beos) \
@@ -260,17 +253,22 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
 	libvlc.c \
+	libvlc-common.c \
 	libvlc.h \
 	interface/interface.c \
 	interface/intf_eject.c \
 	interface/interaction.c \
-	playlist/playlist.c \
+	playlist/playlist_internal.h \
+	playlist/thread.c \
+	playlist/control.c \
+	playlist/engine.c \
 	playlist/sort.c \
 	playlist/loadsave.c \
-	playlist/view.c \
+	playlist/tree.c \
 	playlist/item.c \
-	playlist/item-ext.c \
+	playlist/search.c \
 	playlist/services_discovery.c \
+	input/item.c \
 	input/access.c \
 	input/clock.c \
 	input/control.c \
@@ -278,6 +276,7 @@ SOURCES_libvlc_common = \
 	input/demux.c \
 	input/es_out.c \
 	input/input.c \
+	input/meta.c \
 	input/input_internal.h \
 	input/stream.c \
 	input/mem_stream.c \
@@ -294,12 +293,13 @@ SOURCES_libvlc_common = \
 	audio_output/common.c \
 	audio_output/dec.c \
 	audio_output/filters.c \
-	audio_output/ainput.c \
+	audio_output/input.c \
 	audio_output/mixer.c \
 	audio_output/output.c \
 	audio_output/intf.c \
 	stream_output/stream_output.c \
 	stream_output/announce.c \
+	stream_output/profiles.c \
 	stream_output/sap.c \
 	osd/osd.c \
 	osd/osd_parser.c \
@@ -308,24 +308,27 @@ SOURCES_libvlc_common = \
 	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/tls.c \
-	misc/charset.c \
+	text/charset.c \
+	text/strings.c \
+	text/unicode.c \
+	text/iso_lang.c \
+	text/iso-639_def.h \
 	misc/md5.c \
 	misc/mtime.c \
 	misc/block.c \
 	misc/modules.c \
 	misc/threads.c \
 	misc/stats.c \
-	misc/unicode.c \
 	misc/cpu.c \
 	misc/configuration.c \
+	misc/configuration_chain.c \
 	misc/image.c \
-	misc/iso_lang.c \
-	misc/iso-639_def.h \
 	misc/messages.c \
 	misc/objects.c \
 	misc/variables.c \
@@ -333,23 +336,11 @@ SOURCES_libvlc_common = \
 	misc/update.c \
 	misc/vlm.c \
 	misc/xml.c \
-	misc/hashtables.c \
-	misc/version.c \
+	misc/dict.c \
+	misc/devices.c \
 	extras/libc.c \
-	control/libvlc_core.c \
-	control/libvlc_playlist.c \
-	control/libvlc_vlm.c \
-	control/libvlc_input.c \
-	control/libvlc_video.c \
-	control/libvlc_audio.c \
-	control/mediacontrol_core.c \
-	control/mediacontrol_util.c \
-	control/mediacontrol_audio_video.c \
 	$(NULL)
 
-# These should be distributed, but not compiled
-EXTRA_DIST += control/mediacontrol_init.c control/mediacontrol_plugin.c
-
 SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
 	$(OPT_SOURCES_libvlc_beos) \
@@ -359,7 +350,23 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_getopt) \
 	$(NULL)
 
+SOURCES_libvlc_control = \
+	control/core.c \
+	control/log.c \
+	control/playlist.c \
+	control/vlm.c \
+	control/input.c \
+	control/video.c \
+	control/audio.c \
+	control/mediacontrol_core.c \
+	control/mediacontrol_util.c \
+	control/mediacontrol_audio_video.c
+
 if !USE_LIBTOOL
+if !BUILD_SHARED
+CLEANFILES += misc/version.c
+endif
+
 # Install shared libvlc
 install-exec-local:
 	test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
@@ -369,6 +376,9 @@ uninstall-local:
 	test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 endif
 
+misc/version.c: FORCE
+	$(TOOLBOX) --update-version
+
 ###############################################################################
 # Stamp rules
 ###############################################################################
@@ -377,7 +387,28 @@ stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
 	  top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
 	touch stamp-api
 
+libvlc.sym: $(HEADERS_include)
+	rm -f libvlc.sym
+	(cd $(srcdir) && cat $(HEADERS_include) ) | \
+	sed -ne 's/^.*VLC_EXPORT\s*(\s*\w.*\S\s*,\s*\(\w*\)\s*,\s*(\s*\w.*\S\s*)\s*)[^)]*$$/\1/p' \
+		> libvlc.sym
+
 ###############################################################################
-# Force rule
+# Unit/regression test
 ###############################################################################
+if USE_LIBTOOL
+check_PROGRAMS = test_i18n_atof test_url
+TESTS = $(check_PROGRAMS)
+
+CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
+
+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)
+endif
+
 FORCE: