Symbian: Return 1 as cpu number

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f46a154e2e160b4f0d79e9731ab5bfc11e48a1aa..edc4dbe90c1182abdf275078b68d25e72c861e77 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \
@@ -111,6 +114,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_xml.h \
        ../include/vlc_xlib.h \
        $(NULL)
+nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
        ../include/vlc_codec_synchro.h \
@@ -132,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
@@ -227,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
@@ -257,10 +260,6 @@ 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
@@ -271,14 +270,10 @@ 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 \
+       misc/filesystem.c \
        misc/pthread.c \
        misc/darwin_specific.c \
        $(NULL)
@@ -286,6 +281,7 @@ SOURCES_libvlc_darwin = \
 SOURCES_libvlc_linux = \
        config/dirs_xdg.c \
        misc/atomic.c \
+       misc/filesystem.c \
        misc/pthread.c \
        misc/linux_specific.c \
        $(NULL)
@@ -294,6 +290,7 @@ SOURCES_libvlc_win32 = \
        win32/dirs.c \
        win32/specific.c \
        win32/atomic.c \
+       win32/filesystem.c \
        win32/thread.c \
        win32/winsock.c \
        $(NULL)
@@ -301,13 +298,10 @@ SOURCES_libvlc_win32 = \
 SOURCES_libvlc_other = \
        config/dirs_xdg.c \
        misc/atomic.c \
+       misc/filesystem.c \
        misc/pthread.c \
        misc/not_specific.c
 
-SOURCES_libvlc_dirent = \
-       extras/dirent.c \
-       $(NULL)
-
 SOURCES_libvlc_common = \
        libvlc.c \
        libvlc.h \
@@ -383,7 +377,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 \
@@ -424,6 +417,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 \
@@ -491,10 +485,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 = \