Contribs: put WinCE higher than mingw, because mingw* can match mingwce

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index edc4dbe90c1182abdf275078b68d25e72c861e77..3919d973791295bc53440ea4a24cf36bf86e7f45 100644 (file)
--- 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 \
@@ -229,8 +229,8 @@ libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
-libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
-libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
+libvlc_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+libvlc_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
 
@@ -255,11 +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_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -271,36 +275,47 @@ 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/plugin.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/plugin.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/plugin.c \
        win32/thread.c \
+       win32/specific.c \
        win32/winsock.c \
        $(NULL)
 
+SOURCES_libvlc_symbian = \
+       symbian/path.cpp \
+       symbian/dirs.c \
+       misc/atomic.c \
+       win32/plugin.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 \
@@ -382,6 +397,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 \
@@ -424,12 +440,10 @@ SOURCES_libvlc_common = \
        modules/modules.c \
        modules/cache.c \
        modules/entry.c \
-       modules/os.c \
        modules/textdomain.c \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
-       misc/action.c \
        misc/epg.c \
        misc/exit.c \
        config/configuration.h \
@@ -542,24 +556,7 @@ stamp-revision:
 # Unit/regression test
 ###############################################################################
 
-dist_check_SCRIPTS = check_symbols check_headers
-TESTS = check_symbols
-
-check_DATA = libvlc-headers.sym libvlc-sorted.sym
-CLEANFILES += $(check_DATA)
-
-libvlc-sorted.sym: libvlccore.sym
-       rm -f libvlc-sorted.sym
-       sort -fdu < "$(srcdir)/libvlccore.sym" > libvlc-sorted.sym
-
-libvlc-headers.sym:
-       rm -f libvlc-headers.sym
-       cat ${srcdir}/../include/vlc_*.h ${srcdir}/control/*.h | \
-       sed -n -e 's/^[ ]*VLC_EXPORT[ ]*([^,]*,\([^,]*\),.*/\1/p' | \
-       sed -e 's/[^a-zA-Z0-9_]*//' | \
-       sort -fdu > libvlc-headers.sym
-
-.PHONY: libvlc-headers.sym
+dist_check_SCRIPTS = check_headers
 
 check-local:
        for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \