X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=bbabd316ac30522c3d329c5a27327844f6bab8e0;hb=b271b9ffc4080ae42a549ad9185c8f0c8e0b85e6;hp=cd716b6d38aec0521c261445aff846c9615069ce;hpb=238cc87048585f3699df2f4dbe307c85ed13336f;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index cd716b6d38..bbabd316ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,14 +2,15 @@
 # Automake targets and declarations
 ###############################################################################
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
 SUBDIRS =
 
-EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
+EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 
-BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
-DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h misc/version.c
+BUILT_SOURCES = $(CLEANFILES)
+CLEANFILES = modules/builtin.h misc/revision.c
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -23,12 +24,7 @@ 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/libvlc_structures.h \
 	../include/vlc/mediacontrol.h \
 	../include/vlc/mediacontrol_structures.h \
 	$(NULL)
@@ -37,27 +33,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 \
@@ -65,93 +57,72 @@ 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_epg.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_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 \
 	../include/vlc_threads_funcs.h \
 	../include/vlc_threads.h \
 	../include/vlc_update.h \
-	../include/vlc_video.h \
+	../include/vlc_url.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
+modules/builtin.h: modules/builtin.h.in
 	$(TOOLBOX) --update-includes
 	touch $@
 
-misc/modules.c: misc/modules_builtin.h
-
-misc/version.c: FORCE
-	$(TOOLBOX) --update-version
-
-# These dependencies are mandatory
-$(SOURCES_libvlc): $(LIB_intl)
-
-###############################################################################
-# Optional libintl - FIXME, bad dependencies
-###############################################################################
-
-../intl/libintl.a: FORCE
-	cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS)
-
-if BUILD_INTL
-LIB_intl = ../intl/libintl.a
-endif
+modules/modules.c: modules/builtin.h
 
 ###############################################################################
 # 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/revision.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)
+nodist_libvlc_la_SOURCES = misc/revision.c
+libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
+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)
@@ -173,24 +144,34 @@ OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
 endif
 
 # Build libvlc as a shared library
-if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
-if HAVE_WIN32
-OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
+if USE_LIBTOOL
+lib_LTLIBRARIES = libvlc.la libvlc-control.la
 else
-OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
-endif
+lib_LIBRARIES = libvlc.a
 endif
 
-libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
-	@ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)`" ; \
-	case `$(VLC_CONFIG) --linkage vlc` in \
+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 $(OBJECTS_libvlc_so) $$ldfl ; \
-	$$ld $(OBJECTS_libvlc_so) $$ldfl
+	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 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) \
@@ -205,7 +186,7 @@ SOURCES_libvlc_beos = \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
-	misc/darwin_specific.m \
+	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
@@ -224,17 +205,24 @@ 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.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 \
@@ -242,7 +230,9 @@ SOURCES_libvlc_common = \
 	input/demux.c \
 	input/es_out.c \
 	input/input.c \
+	input/meta.c \
 	input/input_internal.h \
+	input/vlm_internal.h \
 	input/stream.c \
 	input/mem_stream.c \
 	input/subtitles.c \
@@ -255,16 +245,20 @@ 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 \
-	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/stream_output.h \
 	stream_output/announce.c \
+	stream_output/profiles.c \
 	stream_output/sap.c \
+	stream_output/sdp.c \
 	osd/osd.c \
 	osd/osd_parser.c \
 	osd/osd_text.c \
@@ -272,47 +266,44 @@ 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 \
+	network/poll.c \
+	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.c \
+	modules/modules.h \
+	modules/modules.c \
+	modules/entry.c \
 	misc/threads.c \
 	misc/stats.c \
-	misc/unicode.c \
 	misc/cpu.c \
-	misc/configuration.c \
+	modules/configuration.h \
+	modules/configuration.c \
+	modules/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/version.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/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) \
@@ -322,23 +313,79 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_getopt) \
 	$(NULL)
 
-# Install the symlinks and shared libvlc
+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/event.c \
+	control/mediacontrol_internal.h \
+	control/mediacontrol_core.c \
+	control/mediacontrol_util.c \
+	control/mediacontrol_audio_video.c
+
+if !USE_LIBTOOL
+if !HAVE_WIN32
+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
 
 ###############################################################################
 # 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 $@
+
 ###############################################################################
-# Force rule
+# 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 text/charset.c
+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)
+
 FORCE:
+	@echo "Generated source cannot be phony. Go away." >&2
+	@exit 1
+
+.PHONY: FORCE