From f7324726471f5b8d7bc61a908784c40f24e71ed9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Mon, 6 Jul 2009 23:25:53 +0300
Subject: [PATCH] Relax libvlccore.sym ordering (completely)

---
 src/Makefile.am   | 16 ++++++++++++++++
 src/check_symbols | 11 +----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index dda0d538e1..21a862868d 100644
--- 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 4374d8d6a2..59f05f1394 100755
--- 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
-- 
2.39.2