Initial callback support in libvlc + example on how to use in the java bindings

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f4247e06e696cd731df496ea2443c9b4ea311e66..9e4123cc44e54eb8bd9e96260ff5a2819ebc12c3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-###############################################################################
+
 # Automake targets and declarations
 ###############################################################################
 
@@ -7,10 +7,10 @@ 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
+CLEANFILES = modules/builtin.h
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -24,6 +24,7 @@ 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)
@@ -59,6 +60,7 @@ HEADERS_include = \
        ../include/vlc_demux.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 \
@@ -89,18 +91,17 @@ HEADERS_include = \
        ../include/vlc_vout_synchro.h \
        $(NULL)
 
-misc/modules_builtin.h: misc/modules_builtin.h.in
+modules/builtin.h: modules/builtin.h.in
        $(TOOLBOX) --update-includes
        touch $@
 
-misc/modules.c: misc/modules_builtin.h
+modules/modules.c: modules/builtin.h
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
 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`
@@ -156,17 +157,17 @@ endif
 if HAVE_WIN32
 DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
 
-libvlc.dll.a: libvlc$(LIBEXT)
-       $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS)
+libvlc.dll.a libvlc.def: libvlc$(LIBEXT)
+       $(DLLTOOL) -z libvlc.def -l libvlc.dll.a -D $< $(libvlc_a_OBJECTS)
 
-libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
+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) $(LDFLAGS_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
@@ -190,7 +191,7 @@ SOURCES_libvlc_beos = \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
-       misc/darwin_specific.m \
+       misc/darwin_specific.c \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
@@ -236,6 +237,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 \
@@ -261,6 +263,7 @@ SOURCES_libvlc_common = \
        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 \
@@ -274,22 +277,25 @@ SOURCES_libvlc_common = \
        network/httpd.c \
        network/rootwrap.c \
        network/tls.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.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/image.c \
        misc/messages.c \
        misc/objects.c \
@@ -299,7 +305,6 @@ SOURCES_libvlc_common = \
        misc/update.c \
        input/vlm.c \
        misc/xml.c \
-       misc/dict.c \
        misc/devices.c \
        extras/libc.c \
        $(NULL)
@@ -322,6 +327,7 @@ SOURCES_libvlc_control = \
        control/input.c \
        control/video.c \
        control/audio.c \
+       control/callback.c \
        control/mediacontrol_internal.h \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
@@ -329,7 +335,11 @@ SOURCES_libvlc_control = \
 
 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
@@ -341,9 +351,6 @@ uninstall-local:
        test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 endif
 
-misc/version.c: FORCE
-       $(TOOLBOX) --update-version
-
 ###############################################################################
 # Stamp rules
 ###############################################################################
@@ -363,18 +370,21 @@ endif
 # Unit/regression test
 ###############################################################################
 if USE_LIBTOOL
-check_PROGRAMS = test_i18n_atof test_url
+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
 test_url_LDADD = libvlc.la
 test_url_CFLAGS = $(CFLAGS_tests)
-endif
+
+test_utf8_SOURCES = test/utf8.c
+test_utf8_LDADD = libvlc.la
+test_utf8_CFLAGS = $(CFLAGS_tests)
 
 FORCE: