]> git.sesse.net Git - vlc/blobdiff - src/Makefile.am
The current libvlc-control ABI is not compatible with the 0.8.6 one. Change SONAME.
[vlc] / src / Makefile.am
index d9cedbc0d338c4ed931334be4fe1e7a3c4d60a86..2f83036f19f5aefec80e4b497f489084861c77fb 100644 (file)
@@ -5,15 +5,10 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-SUBDIRS =
-
 EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c
 CLEANFILES = $(BUILT_SOURCES)
-MOSTLYCLEANFILES = $(hacklib_DATA) $(noinst_DATA)
-
-TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
 
 ###############################################################################
 # Headers
@@ -35,64 +30,85 @@ 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_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_epg.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_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_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_vout.h \
        ../include/vlc_xml.h \
-       ../include/vlc_vout_synchro.h \
        $(NULL)
 
-modules/builtin.h: modules/builtin.h.in
-       $(TOOLBOX) --update-includes
-       touch $@
+modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
+       rm -f -- "$@.tmp"
+       cat "$(srcdir)/modules/builtin.h.in" > "$@.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" "$@"
 
 modules/modules.c: modules/builtin.h
 
@@ -100,29 +116,41 @@ modules/modules.c: modules/builtin.h
 # Building libvlc
 ###############################################################################
 
+nice:
+       $(top_builddir)/compile
+
 lib_LTLIBRARIES = libvlc.la libvlc-control.la
 
-AM_LDFLAGS =
+AM_LDFLAGS = -no-undefined -no-install
 if HAVE_WIN32
-AM_LDFLAGS += -static
+AM_LDFLAGS += -avoid-version
 endif
 
 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` $(AM_LDFLAGS) \
-       -no-undefined -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0
+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) \
-       -no-undefined -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' \
-       -version-info 0:0:0
+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
 
 EXTRA_libvlc_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
@@ -150,34 +178,6 @@ if BUILD_GETOPT
 libvlc_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
 
-if HAVE_WIN32
-# Überhack. Needs fixing.
-hacklibdir = $(libdir)
-hacklib_DATA = libvlc.dll libvlc.dll.a
-noinst_DATA = libvlc.def
-
-libvlc.dll.a libvlc.def: libvlc.dll
-       $(DLLTOOL) -z libvlc.def -l libvlc.dll.a -D $< $(libvlc_a_OBJECTS)
-
-libvlc.dll: $(libvlc_la_OBJECTS)
-
-.la.dll:
-       @ldfl="`$(VLC_CONFIG) --libs plugin libvlc pic`" ; \
-       objs="" ; \
-       for s in $^; do \
-               test "$$s" = "$<" || \
-               objs="$$objs $$(dirname "$$s")/.libs/$$(basename $${s%.lo}).o" ; \
-       done ; \
-       case `$(VLC_CONFIG) --linkage libvlc` in \
-         c++)  ld="$(CXXLINK)" ;; \
-         c|*)  ld="$(LINK)" ;; \
-       esac ; \
-       echo $$ld $$objs$ldfl; \
-       $$ld $$objs $$ldfl 
-# Cygwin libtool work-around
-       @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
-endif
-
 SOURCES_libvlc_beos = \
        misc/beos_specific.cpp \
        $(NULL)
@@ -224,6 +224,7 @@ SOURCES_libvlc_common = \
        input/clock.c \
        input/control.c \
        input/decoder.c \
+       input/decoder_synchro.c \
        input/demux.c \
        input/es_out.c \
        input/input.c \
@@ -240,7 +241,6 @@ SOURCES_libvlc_common = \
        video_output/video_text.c \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
-       video_output/vout_synchro.c \
        video_output/vout_intf.c \
        audio_output/aout_internal.h \
        audio_output/common.c \
@@ -277,6 +277,7 @@ SOURCES_libvlc_common = \
        text/iso_lang.c \
        text/iso-639_def.h \
        misc/md5.c \
+       misc/rand.c \
        misc/mtime.c \
        misc/block.c \
        modules/modules.h \
@@ -288,6 +289,7 @@ SOURCES_libvlc_common = \
        modules/configuration.h \
        modules/configuration.c \
        modules/configuration_chain.c \
+       misc/events.c \
        misc/image.c \
        misc/messages.c \
        misc/objects.c \
@@ -318,29 +320,27 @@ 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/media_descriptor.c \
        control/media_instance.c \
+       control/media_list.c \
+       control/media_list_path.h \
+       control/media_list_player.c \
+       control/media_list_view.c \
+       control/media_library.c \
        control/mediacontrol_internal.h \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
-       control/mediacontrol_audio_video.c
+       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
@@ -351,10 +351,8 @@ misc/revision.c:
 ###############################################################################
 # 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`