Relax libvlccore.sym ordering (completely)

diff --git a/src/Makefile.am b/src/Makefile.am
index dda0d538e1da53d9ca84f8d0219215efc6a5f9bf..21a862868d9e0606345e53cfa1241ba6a60fbd59 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -501,6 +501,22 @@ stamp-revision:
 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
+
 check-local:
        for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \
        do \

diff --git a/src/check_symbols b/src/check_symbols
index 4374d8d6a2295d1d10a0b965a88307bb791e0637..59f05f139471b235767e93f1301fc7d59a9ff1c1 100755 (executable)
--- a/src/check_symbols
+++ b/src/check_symbols
@@ -2,14 +2,7 @@
 # Plugin API consistency check for VLC
 # Copyright © 2007 Rémi Denis-Courmont.
 
-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
-
-if ! diff -u ${srcdir}/libvlccore.sym libvlc-headers.sym; then
+if ! diff -u ${srcdir}/libvlccore.sym libvlc-sorted.sym; then
        echo "Mismatching symbols found!"
        exit 1
 fi
@@ -19,5 +12,3 @@ fi
 #      echo "Illegal symbol name (starting with underscore) found!";
 #      exit 1
 #fi
-
-rm -f libvlc-headers.sym