Remove never used aout_output_t.pf_volume_get

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 09bb0853fb42e6b82851d586583587538993c6f4..1876fe09d9edc3fc656fb92240d4fbc19314b394 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,15 +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 = \
        $(nodist_pkginclude_HEADERS) \
-       ../include/vlc_about.h
+       $(nodist_pluginsinclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc .rc.in .rc
@@ -71,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 \
@@ -108,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 \
@@ -136,7 +137,8 @@ noinst_HEADERS = \
        $(NULL)
 
 ../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status
-       $(SHELL) $(top_builddir)/config.status --file=$@
+       $(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"
@@ -233,7 +235,6 @@ endif
 
 
 EXTRA_libvlccore_la_SOURCES = \
-       $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
@@ -242,9 +243,6 @@ EXTRA_libvlccore_la_SOURCES = \
        $(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
@@ -257,6 +255,9 @@ 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
@@ -273,38 +274,44 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
 endif
 endif
 
-SOURCES_libvlc_beos = \
-       misc/atomic.c \
-       misc/pthread.c \
-       $(NULL)
-
 SOURCES_libvlc_darwin = \
-       config/dirs_macos.c \
+       posix/darwin_dirs.c \
        misc/atomic.c \
-       misc/pthread.c \
-       misc/darwin_specific.c \
+       posix/filesystem.c \
+       posix/thread.c \
+       posix/darwin_specific.c \
        $(NULL)
 
 SOURCES_libvlc_linux = \
-       config/dirs_xdg.c \
+       posix/dirs.c \
        misc/atomic.c \
-       misc/pthread.c \
-       misc/linux_specific.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_symbian = \
+       symbian/path.cpp \
+       symbian/dirs.c \
+       misc/atomic.c \
+       $(NULL)
+
 SOURCES_libvlc_other = \
-       config/dirs_xdg.c \
+       posix/dirs.c \
        misc/atomic.c \
-       misc/pthread.c \
-       misc/not_specific.c
+       posix/filesystem.c \
+       posix/thread.c \
+       posix/specific.c \
+       $(NULL)
 
 SOURCES_libvlc_common = \
        libvlc.c \
@@ -381,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 \
@@ -422,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 \
@@ -433,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 \
@@ -489,7 +496,6 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
-       $(OPT_SOURCES_libvlc_beos) \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
        $(NULL)