X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=a8b441192eee7c6704d480666c28261b498526dd;hb=c59b99775c8c9c8f1c9b76773b16fdc7ba2c45b4;hp=70c55ffd83b215450ef07757a75ba343fafabe5f;hpb=c60745f8149a22ff39f1691913a357d5ec12567e;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 70c55ffd83..a8b441192e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,9 @@ SUBDIRS =
 
 EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
-BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
-DISTCLEANFILES = stamp-api
+BUILT_SOURCES = $(CLEANFILES)
 CLEANFILES = misc/modules_builtin.h
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
+MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
 
@@ -25,12 +24,6 @@ pkgincludedir = $(includedir)/vlc
 dist_pkginclude_HEADERS = \
 	../include/vlc/vlc.h \
 	../include/vlc/libvlc.h \
-	../include/vlc/aout.h \
-	../include/vlc/vout.h \
-	../include/vlc/sout.h \
-	../include/vlc/decoder.h \
-	../include/vlc/input.h \
-	../include/vlc/intf.h \
 	../include/vlc/mediacontrol.h \
 	../include/vlc/mediacontrol_structures.h \
 	$(NULL)
@@ -39,27 +32,23 @@ noinst_HEADERS = $(HEADERS_include)
 noinst_DATA = $(DATA_noinst_libvlc)
 
 HEADERS_include = \
-	../include/aout_internal.h \
-	../include/audio_output.h \
-	../include/beos_specific.h \
-	../include/charset.h \
-	../include/codecs.h \
-	../include/configuration.h \
-	../include/darwin_specific.h \
-	../include/intf_eject.h \
 	../include/iso_lang.h \
 	../include/main.h \
 	../include/mmx.h \
-	../include/modules.h \
-	../include/modules_inner.h \
-	../include/mtime.h \
-	../include/network.h \
-	../include/os_specific.h \
-	../include/snapshot.h \
-	../include/stream_output.h \
-	../include/variables.h \
-	../include/video_output.h \
+	../include/vlc_modules.h \
+	../include/vlc_modules_macros.h \
+	../include/vlc_os_specific.h \
+	../include/vlc_mtime.h \
+	../include/vlc_network.h \
+	../include/vlc_codecs.h \
+	../include/vlc_configuration.h \
+	../include/vlc_charset.h \
+	../include/vlc_sout.h \
+	../include/vlc_streaming.h \
+	../include/vlc_variables.h \
+	../include/vlc_aout.h \
 	../include/vlc_access.h \
+	../include/vlc_arrays.h \
 	../include/vlc_acl.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
@@ -67,9 +56,7 @@ HEADERS_include = \
 	../include/vlc_codec.h \
 	../include/vlc_common.h \
 	../include/vlc_config.h \
-	../include/vlc_cpu.h \
 	../include/vlc_demux.h \
-	../include/vlc_error.h \
 	../include/vlc_es.h \
 	../include/vlc_es_out.h \
 	../include/vlc_filter.h \
@@ -80,15 +67,14 @@ HEADERS_include = \
 	../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 \
 	../include/vlc_objects.h \
 	../include/vlc_osd.h \
 	../include/vlc_playlist.h \
-	../include/vlc_spu.h \
 	../include/vlc_stream.h \
 	../include/vlc_strings.h \
 	../include/vlc_symbols.h \
@@ -96,70 +82,44 @@ HEADERS_include = \
 	../include/vlc_threads.h \
 	../include/vlc_update.h \
 	../include/vlc_url.h \
-	../include/vlc_video.h \
+	../include/vlc_vout.h \
 	../include/vlc_vlm.h \
 	../include/vlc_vod.h \
 	../include/vlc_xml.h \
-	../include/vout_synchro.h \
-	../include/win32_specific.h \
-	../include/libvlc_internal.h \
-	../include/mediacontrol_internal.h
+	../include/vlc_vout_synchro.h \
 	$(NULL)
 
-misc/modules_builtin.h: Makefile misc/modules_builtin.h.in ../vlc-config
+misc/modules_builtin.h: misc/modules_builtin.h.in
 	$(TOOLBOX) --update-includes
 	touch $@
 
 misc/modules.c: misc/modules_builtin.h
 
-###############################################################################
-# Building builtin modules
-###############################################################################
-#
-# As long as we use builtins with a shared libvlc, we must build them before
-# we build libvlc. Maybe one day, libvlc will handle multiple modules per
-# shared object, which will make builtins fairly redumdant. Until then, we
-# need this workaround.
-
-stamp-builtins: Makefile ../vlc-config ../config.status
-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_builtin.la/g' | \
-	while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
-endif
-if BUILD_SHARED
-	@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.a; eval "($$cmd.a)" || exit $$? ; done
-endif
-	touch $@
-
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-libvlc_a_SOURCES = $(SOURCES_libvlc)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc $(pic)`
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc $(pic)`
-libvlc_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 libvlc pic` -DUSE_BUILTINS
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc pic`
+libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc 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/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
-		-avoid-version -no-undefined
-libvlc_la_DEPENDENCIES = stamp-builtins
-
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
+libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` \
+	-no-undefined -export-symbols $(srcdir)/libvlc.sym -version-info 1: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 libvlc`
+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)
@@ -182,33 +142,40 @@ 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 HAVE_WIN32
+pic =
+else
+pic = pic
+endif
+
 if HAVE_WIN32
 if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
+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)" ; \
-	case `$(VLC_CONFIG) --linkage vlc builtin` in \
+libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
+	@ldfl="`$(VLC_CONFIG) --libs plugin libvlc pic` $(INCLUDED_LIBINTL)" ; \
+	case `$(VLC_CONFIG) --linkage libvlc` in \
 	  c++)  ld="$(CXXLINK)" ;; \
 	  objc) ld="$(OBJCLINK)" ;; \
 	  c|*)  ld="$(LINK)" ;; \
 	esac ; \
 	echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
 	$$ld $(libvlc_a_OBJECTS) \
-		-Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl
+		$$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 work-around
+# Cygwin libtool work-around
 	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 endif
 
@@ -244,10 +211,14 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
 	libvlc.c \
+	libvlc-common.c \
 	libvlc.h \
+	libvlc-module.c \
+	interface/interface.h \
 	interface/interface.c \
 	interface/intf_eject.c \
 	interface/interaction.c \
+	playlist/playlist_internal.h \
 	playlist/thread.c \
 	playlist/control.c \
 	playlist/engine.c \
@@ -265,6 +236,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 \
@@ -278,6 +250,7 @@ SOURCES_libvlc_common = \
 	video_output/vout_subpictures.c \
 	video_output/vout_synchro.c \
 	video_output/vout_intf.c \
+	audio_output/aout_internal.h \
 	audio_output/common.c \
 	audio_output/dec.c \
 	audio_output/filters.c \
@@ -286,7 +259,9 @@ SOURCES_libvlc_common = \
 	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 \
 	osd/osd.c \
 	osd/osd_parser.c \
@@ -301,44 +276,36 @@ SOURCES_libvlc_common = \
 	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.h \
 	misc/modules.c \
 	misc/threads.c \
 	misc/stats.c \
-	misc/strings.c \
-	misc/unicode.c \
 	misc/cpu.c \
+	misc/configuration.h \
 	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.h \
 	misc/variables.c \
 	misc/error.c \
 	misc/update.c \
-	misc/vlm.c \
+	input/vlm.c \
 	misc/xml.c \
-	misc/hashtables.c \
+	misc/dict.c \
 	misc/devices.c \
 	extras/libc.c \
-	control/core.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 \
 	$(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) \
@@ -348,16 +315,23 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_getopt) \
 	$(NULL)
 
+SOURCES_libvlc_control = \
+	control/libvlc_internal.h \
+	control/core.c \
+	control/log.c \
+	control/playlist.c \
+	control/vlm.c \
+	control/input.c \
+	control/video.c \
+	control/audio.c \
+	control/mediacontrol_internal.h \
+	control/mediacontrol_core.c \
+	control/mediacontrol_util.c \
+	control/mediacontrol_audio_video.c
 
 if !USE_LIBTOOL
 if !BUILD_SHARED
-SOURCES_libvlc += misc/version.c
 CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-	$(TOOLBOX) --update-version
-FORCE:
-
 endif
 
 # Install shared libvlc
@@ -369,14 +343,24 @@ uninstall-local:
 	test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 endif
 
+misc/version.c: FORCE
+	$(TOOLBOX) --update-version
+
 ###############################################################################
 # Stamp rules
 ###############################################################################
+
+if !USE_LIBTOOL
+if !BUILD_SHARED
 stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
 	( cd $(srcdir) && cat $(HEADERS_include) ) | \
 	  top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
 	touch stamp-api
 
+CLEANFILES += stamp-api
+endif
+endif
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################
@@ -384,7 +368,7 @@ if USE_LIBTOOL
 check_PROGRAMS = test_i18n_atof test_url
 TESTS = $(check_PROGRAMS)
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
+CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
 test_i18n_atof_SOURCES = test/i18n_atof.c
 test_i18n_atof_LDADD = libvlc.la
@@ -395,3 +379,4 @@ test_url_LDADD = libvlc.la
 test_url_CFLAGS = $(CFLAGS_tests)
 endif
 
+FORCE: