Simplified mouse handling in transform filter.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c88d2e51360e952f7c1a4d87359422d419b9e295..6ac06ea227c466dd02441d0eedcb98bb228b5d9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,11 +7,11 @@ 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) \
@@ -137,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"
@@ -234,7 +235,6 @@ endif
 
 
 EXTRA_libvlccore_la_SOURCES = \
-       $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
@@ -243,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
@@ -263,7 +260,6 @@ endif
 endif
 endif
 endif
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -274,11 +270,6 @@ 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 \
        misc/atomic.c \
@@ -382,7 +373,6 @@ 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 \
@@ -423,6 +413,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 \
@@ -490,7 +481,6 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
-       $(OPT_SOURCES_libvlc_beos) \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
        $(NULL)