]> git.sesse.net Git - vlc/blobdiff - src/Makefile.am
Remove never used aout_output_t.pf_volume_get
[vlc] / src / Makefile.am
index 77ddcb5f426e23ccff5ea905ef987d25e9836495..1876fe09d9edc3fc656fb92240d4fbc19314b394 100644 (file)
@@ -7,13 +7,15 @@ SUBDIRS = . test
 
 NULL =
 EXTRA_DIST = extras/COPYING \
-       misc/beos_specific.cpp \
        libvlc.pc.in \
        vlc-plugin.pc.in \
        libvlc.sym \
-       libvlccore.sym
+       libvlccore.sym \
+       ../include/vlc/libvlc_version.h.in
 
-BUILT_SOURCES = ../include/vlc_about.h
+BUILT_SOURCES = \
+       $(nodist_pkginclude_HEADERS) \
+       $(nodist_pluginsinclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc .rc.in .rc
@@ -38,6 +40,7 @@ pkginclude_HEADERS = \
        ../include/vlc/libvlc_structures.h \
        ../include/vlc/libvlc_vlm.h \
        $(NULL)
+nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h
 
 pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
@@ -46,6 +49,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_aout_mixer.h \
        ../include/vlc_arrays.h \
        ../include/vlc_art_finder.h \
+       ../include/vlc_atomic.h \
        ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
@@ -67,6 +71,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_fourcc.h \
        ../include/vlc_fs.h \
        ../include/vlc_gcrypt.h \
+       ../include/vlc_opengl.h \
        ../include/vlc_http.h \
        ../include/vlc_httpd.h \
        ../include/vlc_image.h \
@@ -77,6 +82,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_md5.h \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
+       ../include/vlc_media_library.h \
        ../include/vlc_modules.h \
        ../include/vlc_mouse.h \
        ../include/vlc_mtime.h \
@@ -103,12 +109,12 @@ pluginsinclude_HEADERS = \
        ../include/vlc_video_splitter.h \
        ../include/vlc_vout.h \
        ../include/vlc_vout_display.h \
-       ../include/vlc_vout_opengl.h \
        ../include/vlc_vout_osd.h \
        ../include/vlc_vout_window.h \
        ../include/vlc_xml.h \
        ../include/vlc_xlib.h \
        $(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
        ../include/vlc_codec_synchro.h \
@@ -130,6 +136,10 @@ noinst_HEADERS = \
        ../include/vlc_windows_interfaces.h \
        $(NULL)
 
+../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
+       $(AM_V_GEN)cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
+
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
        $(AM_V_at)rm -f -- "$@.tmp"
        $(AM_V_at)mkdir -p -- ../include
@@ -142,7 +152,7 @@ noinst_HEADERS = \
                "$(top_srcdir)/THANKS" && \
        echo ";" && \
        echo "static const char psz_authors[] =" && \
-       sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \
+       sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \
                "$(top_srcdir)/AUTHORS" && \
        echo ";") >> "$@.tmp"
        $(AM_V_at)mv -f -- "$@.tmp" "$@"
@@ -215,7 +225,7 @@ libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
        libvlccore.la ../compat/libcompat.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
-       -version-info 5:0:0 \
+       -version-info 6:0:1 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
@@ -225,19 +235,14 @@ endif
 
 
 EXTRA_libvlccore_la_SOURCES = \
-       $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_other) \
-       $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
        $(SOURCES_libvlc_vlm) \
        $(NULL)
-if HAVE_BEOS
-libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
-else
 if HAVE_DARWIN
 libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
 else
@@ -250,15 +255,15 @@ else
 if HAVE_WINCE
 libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
 else
+if HAVE_SYMBIAN
+#libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian)
+else
 libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
 endif
 endif
 endif
 endif
 endif
-if BUILD_DIRENT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -269,36 +274,43 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
 endif
 endif
 
-SOURCES_libvlc_beos = \
-       misc/pthread.c \
-       $(NULL)
-
 SOURCES_libvlc_darwin = \
-       config/dirs_macos.c \
-       misc/pthread.c \
-       misc/darwin_specific.c \
+       posix/darwin_dirs.c \
+       misc/atomic.c \
+       posix/filesystem.c \
+       posix/thread.c \
+       posix/darwin_specific.c \
        $(NULL)
 
 SOURCES_libvlc_linux = \
-       config/dirs_xdg.c \
-       misc/pthread.c \
-       misc/linux_specific.c \
+       posix/dirs.c \
+       misc/atomic.c \
+       posix/filesystem.c \
+       posix/thread.c \
+       posix/linux_specific.c \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
        win32/dirs.c \
-       win32/specific.c \
+       win32/atomic.c \
+       win32/filesystem.c \
        win32/thread.c \
+       win32/specific.c \
        win32/winsock.c \
        $(NULL)
 
-SOURCES_libvlc_other = \
-       config/dirs_xdg.c \
-       misc/pthread.c \
-       misc/not_specific.c
+SOURCES_libvlc_symbian = \
+       symbian/path.cpp \
+       symbian/dirs.c \
+       misc/atomic.c \
+       $(NULL)
 
-SOURCES_libvlc_dirent = \
-       extras/dirent.c \
+SOURCES_libvlc_other = \
+       posix/dirs.c \
+       misc/atomic.c \
+       posix/filesystem.c \
+       posix/thread.c \
+       posix/specific.c \
        $(NULL)
 
 SOURCES_libvlc_common = \
@@ -376,12 +388,12 @@ SOURCES_libvlc_common = \
        video_output/postprocessing.c \
        video_output/postprocessing.h \
        video_output/video_output.c \
-       video_output/vout_pictures.c \
        video_output/video_text.c \
        video_output/video_epg.c \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
        video_output/window.c \
+       video_output/opengl.c \
        video_output/vout_intf.c \
        video_output/vout_internal.h \
        video_output/vout_control.h \
@@ -417,6 +429,7 @@ SOURCES_libvlc_common = \
        misc/block.c \
        misc/fourcc.c \
        misc/es_format.c \
+       misc/picture.c \
        misc/picture_fifo.c \
        misc/picture_pool.c \
        modules/modules.h \
@@ -428,7 +441,6 @@ SOURCES_libvlc_common = \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
-       misc/action.c \
        misc/epg.c \
        misc/exit.c \
        config/configuration.h \
@@ -452,6 +464,7 @@ SOURCES_libvlc_common = \
        misc/update.c \
        misc/update_crypto.c \
        misc/xml.c \
+       misc/media_library.c \
        extras/libc.c \
        extras/tdestroy.c \
        misc/filter.c \
@@ -483,10 +496,8 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
-       $(OPT_SOURCES_libvlc_beos) \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
-       $(OPT_SOURCES_libvlc_dirent) \
        $(NULL)
 
 SOURCES_libvlc_control = \