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 1876fe09d9edc3fc656fb92240d4fbc19314b394..3919d973791295bc53440ea4a24cf36bf86e7f45 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
 
 
@@ -278,6 +278,7 @@ SOURCES_libvlc_darwin = \
        posix/darwin_dirs.c \
        misc/atomic.c \
        posix/filesystem.c \
+       posix/plugin.c \
        posix/thread.c \
        posix/darwin_specific.c \
        $(NULL)
@@ -286,6 +287,7 @@ SOURCES_libvlc_linux = \
        posix/dirs.c \
        misc/atomic.c \
        posix/filesystem.c \
+       posix/plugin.c \
        posix/thread.c \
        posix/linux_specific.c \
        $(NULL)
@@ -294,6 +296,7 @@ SOURCES_libvlc_win32 = \
        win32/dirs.c \
        win32/atomic.c \
        win32/filesystem.c \
+       win32/plugin.c \
        win32/thread.c \
        win32/specific.c \
        win32/winsock.c \
@@ -303,6 +306,7 @@ SOURCES_libvlc_symbian = \
        symbian/path.cpp \
        symbian/dirs.c \
        misc/atomic.c \
+       win32/plugin.c \
        $(NULL)
 
 SOURCES_libvlc_other = \
@@ -436,7 +440,6 @@ SOURCES_libvlc_common = \
        modules/modules.c \
        modules/cache.c \
        modules/entry.c \
-       modules/os.c \
        modules/textdomain.c \
        misc/threads.c \
        misc/stats.c \
@@ -553,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`; \