Remove never used aout_output_t.pf_volume_get

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
old mode 100755 (executable)
new mode 100644 (file)
index a445751..1876fe0
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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,7 +109,6 @@ 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 \
@@ -238,7 +238,6 @@ EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_darwin) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
-       $(SOURCES_libvlc_symbian) \
        $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
@@ -257,7 +256,7 @@ if HAVE_WINCE
 libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
 else
 if HAVE_SYMBIAN
-libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian)
+#libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian)
 else
 libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
 endif
@@ -276,40 +275,43 @@ endif
 endif
 
 SOURCES_libvlc_darwin = \
-       config/dirs_macos.c \
+       posix/darwin_dirs.c \
        misc/atomic.c \
-       misc/filesystem.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/filesystem.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/filesystem.c \
-       misc/pthread.c \
-       misc/not_specific.c
+       posix/filesystem.c \
+       posix/thread.c \
+       posix/specific.c \
+       $(NULL)
 
 SOURCES_libvlc_common = \
        libvlc.c \
@@ -391,6 +393,7 @@ SOURCES_libvlc_common = \
        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 \
@@ -438,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 \