X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=c4a74b53c6ccf4dfd577db388c53adede1b64842;hb=8d7e530f40ef0dfa7de448f786da40c066db9278;hp=a214004153044702cee0fa247c40923ef0e59a54;hpb=94eb8608ceed90b5d0905c9a6bc54dafc2c8c4f5;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index a214004153..c4a74b53c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,14 @@
-
+###############################################################################
 # Automake targets and declarations
 ###############################################################################
 
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-SUBDIRS =
-
-EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 
-BUILT_SOURCES = $(CLEANFILES)
-CLEANFILES = misc/modules_builtin.h
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
-
-TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
+BUILT_SOURCES = modules/builtin.h misc/revision.c
+CLEANFILES = $(BUILT_SOURCES)
 
 ###############################################################################
 # Headers
@@ -24,172 +19,166 @@ pkgincludedir = $(includedir)/vlc
 dist_pkginclude_HEADERS = \
 	../include/vlc/vlc.h \
 	../include/vlc/libvlc.h \
+	../include/vlc/libvlc_structures.h \
 	../include/vlc/mediacontrol.h \
 	../include/vlc/mediacontrol_structures.h \
 	$(NULL)
 
 noinst_HEADERS = $(HEADERS_include)
-noinst_DATA = $(DATA_noinst_libvlc)
 
 HEADERS_include = \
 	../include/iso_lang.h \
 	../include/main.h \
 	../include/mmx.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_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_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_config_cat.h \
 	../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_interface.h \
 	../include/vlc_intf_strings.h \
 	../include/vlc_keys.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_os_specific.h \
 	../include/vlc_osd.h \
 	../include/vlc_playlist.h \
+	../include/vlc_sout.h \
 	../include/vlc_stream.h \
+	../include/vlc_streaming.h \
 	../include/vlc_strings.h \
-	../include/vlc_symbols.h \
-	../include/vlc_threads_funcs.h \
 	../include/vlc_threads.h \
+	../include/vlc_threads_funcs.h \
+	../include/vlc_tls.h \
 	../include/vlc_update.h \
 	../include/vlc_url.h \
-	../include/vlc_vout.h \
+	../include/vlc_variables.h \
 	../include/vlc_vlm.h \
 	../include/vlc_vod.h \
-	../include/vlc_xml.h \
+	../include/vlc_vout.h \
 	../include/vlc_vout_synchro.h \
+	../include/vlc_xml.h \
 	$(NULL)
 
-misc/modules_builtin.h: misc/modules_builtin.h.in
-	$(TOOLBOX) --update-includes
-	touch $@
+modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
+	rm -f -- "$@.tmp"
+	cat "$<" > "$@.tmp"
+if !HAVE_PLUGINS
+	plugins="$$($(VLC_CONFIG) --list plugin)" ; \
+	test -n "$${plugins}" && \
+	for p in $${plugins}; do \
+		echo "int vlc_entry__$$p (module_t *);" ; \
+	done >> "$@.tmp"
+endif
+	echo "#define ALLOCATE_ALL_BUILTINS() \\" >> "$@.tmp"
+	echo "    do \\" >> "$@.tmp"
+	echo "    { \\" >> "$@.tmp"
+if !HAVE_PLUGINS
+	plugins="$$($(VLC_CONFIG) --list plugin)" ; \
+	test -n "$${plugins}" && \
+	for p in $${plugins}; do \
+		echo "        ALLOCATE_BUILTIN($$p); \\" ; \
+	done >> "$@.tmp"
+endif
+	echo '    } while( 0 );' >> "$@.tmp"
+	mv -f -- "$@.tmp" "$@"
 
-misc/modules.c: misc/modules_builtin.h
+modules/modules.c: modules/builtin.h
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
-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`
+lib_LTLIBRARIES = libvlc.la libvlc-control.la
+
+AM_LDFLAGS = -no-undefined
+if HAVE_WIN32
+AM_LDFLAGS += -avoid-version
+endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
-libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
+nodist_libvlc_la_SOURCES = misc/revision.c
+libvlc_la_LIBADD = $(LTLIBINTL)
 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_LDFLAGS = `$(VLC_CONFIG) --libs 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_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
+libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
+if HAVE_COMPILER_EXPORT
+libvlc_control_la_LDFLAGS += -export-dynamic
+else
+libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
+endif
 
+EXTRA_libvlc_la_SOURCES = \
+	$(SOURCES_libvlc_beos) \
+	$(SOURCES_libvlc_darwin) \
+	$(SOURCES_libvlc_win32) \
+	$(SOURCES_libvlc_dirent) \
+	$(SOURCES_libvlc_getopt) \
+	$(NULL)
 if HAVE_BEOS
-OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
+libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
 endif
 if HAVE_DARWIN
-OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin)
+libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
 endif
 if HAVE_WIN32
-OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
+libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
 endif
 if HAVE_WINCE
-OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
+libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
 endif
 if BUILD_DIRENT
-OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent)
+libvlc_la_SOURCES += $(SOURCES_libvlc_dirent)
 endif
 if BUILD_GETOPT
-OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
+libvlc_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
 
-# Build libvlc as a shared library
-if USE_LIBTOOL
-lib_LTLIBRARIES = libvlc.la libvlc-control.la
-else
-lib_LIBRARIES = libvlc.a
-endif
-
-if HAVE_WIN32
-pic =
-else
-pic = pic
-endif
-
-if HAVE_WIN32
-DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
-
-libvlc.dll.a libvlc.def: libvlc$(LIBEXT)
-	$(DLLTOOL) -z libvlc.def -l libvlc.dll.a -D $< $(libvlc_a_OBJECTS)
-
-libvlc$(LIBEXT): $(libvlc_a_OBJECTS)
-	@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 $(libvlc_a_OBJECTS) $$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) \
-	$(SOURCES_libvlc_darwin) \
-	$(SOURCES_libvlc_win32) \
-	$(SOURCES_libvlc_dirent) \
-	$(SOURCES_libvlc_getopt) \
-	$(NULL)
-
 SOURCES_libvlc_beos = \
 	misc/beos_specific.cpp \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
-	misc/darwin_specific.m \
+	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
@@ -235,6 +224,7 @@ SOURCES_libvlc_common = \
 	input/input.c \
 	input/meta.c \
 	input/input_internal.h \
+	input/vlm_internal.h \
 	input/stream.c \
 	input/mem_stream.c \
 	input/subtitles.c \
@@ -278,19 +268,22 @@ SOURCES_libvlc_common = \
 	text/charset.c \
 	text/strings.c \
 	text/unicode.c \
+	text/wincp.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 \
+	modules/modules.h \
+	modules/modules.c \
+	modules/entry.c \
 	misc/threads.c \
 	misc/stats.c \
 	misc/cpu.c \
-	misc/configuration.h \
-	misc/configuration.c \
-	misc/configuration_chain.c \
+	modules/configuration.h \
+	modules/configuration.c \
+	modules/configuration_chain.c \
+	misc/events.c \
 	misc/image.c \
 	misc/messages.c \
 	misc/objects.c \
@@ -319,59 +312,43 @@ SOURCES_libvlc_control = \
 	control/log.c \
 	control/playlist.c \
 	control/vlm.c \
-	control/input.c \
 	control/video.c \
 	control/audio.c \
+	control/dynamic_media_list.c \
+	control/event.c \
+	control/flat_media_list.c \
+	control/media_descriptor.c \
+	control/media_instance.c \
+	control/media_list.c \
+	control/media_list_player.c \
+	control/media_library.c \
 	control/mediacontrol_internal.h \
 	control/mediacontrol_core.c \
 	control/mediacontrol_util.c \
-	control/mediacontrol_audio_video.c
-
-if !USE_LIBTOOL
-if !HAVE_WIN32
-nodist_libvlc_a_SOURCES = misc/version.c
-CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-	$(TOOLBOX) --update-version
-endif
-
-# Install shared libvlc
-install-exec-local:
-	test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
-
-# the opposite of install-{data,exec}-local
-uninstall-local:
-	test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
-endif
+	control/mediacontrol_audio_video.c \
+	control/media_discoverer.c \
+	control/tag_query.c
 
 ###############################################################################
 # Stamp rules
 ###############################################################################
 
-if !USE_LIBTOOL
-if !HAVE_WIN32
-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
+misc/revision.c:
+	rm -f $@ $@.tmp
+	echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
+	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \
+	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
+	mv -f $@.tmp $@
 
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-if USE_LIBTOOL
 check_PROGRAMS = test_i18n_atof test_url test_utf8
 TESTS = $(check_PROGRAMS)
-endif
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
-test_i18n_atof_SOURCES = test/i18n_atof.c
-test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
 test_i18n_atof_CFLAGS = $(CFLAGS_tests)
 
 test_url_SOURCES = test/url.c
@@ -383,3 +360,7 @@ test_utf8_LDADD = libvlc.la
 test_utf8_CFLAGS = $(CFLAGS_tests)
 
 FORCE:
+	@echo "Generated source cannot be phony. Go away." >&2
+	@exit 1
+
+.PHONY: FORCE