From 087ed3b7b3c8b1a0237e4a712c82a02f04879d72 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 5 Apr 2005 08:50:22 +0000
Subject: [PATCH] lib.mk, rules.mk, make-version-script.sh: Fix versionscript
 handling

---
 make/lib.mk                    |  2 +-
 make/rules.mk                  |  5 ++---
 scripts/make-version-script.sh | 10 ++++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/make/lib.mk b/make/lib.mk
index 33c48e6e..ae459a4d 100644
--- a/make/lib.mk
+++ b/make/lib.mk
@@ -11,7 +11,7 @@ all: $(LIB_SO) $(LINKS_SO)
 include $(MODDIR)/make/rules.mk
 
 install: $(LOCAL_TARGETS) all $(INSTALLED_LIB_A) $(INSTALLED_LIB_SO) $(INSTALLED_LINKS_SO)
-clean: local_libclean
+clean: libclean local_libclean
 distclean: clean
 local_libclean:
 	rm -rf *.a *.o *.so.* *.so *~ st* .*.swp *.done
diff --git a/make/rules.mk b/make/rules.mk
index 9d78fc55..184544c8 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -44,8 +44,7 @@ version.ldscript:
 	$(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@
 
 $(LIB_SO): version.ldscript $(LIB_A)
-	$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(filter-out version.ldscript, $<) \
-		 -Wl,--no-whole-archive -Wl,--version-script=version.ldscript \
+	$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $^ -Wl,--no-whole-archive \
 		$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
 
 $(TOPDIR)/include:
@@ -201,7 +200,7 @@ localclean: $(LOCAL_CLEAN)
 	rm -rf $(CLEAN)
 
 libclean:
-	rm -rf $(LIB_A) $(LIB_SO)
+	rm -rf $(LIB_A) $(LIB_SO) version.ldscript
 
 vcdistclean:
 	rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk
diff --git a/scripts/make-version-script.sh b/scripts/make-version-script.sh
index d0b951fd..cc9fac44 100644
--- a/scripts/make-version-script.sh
+++ b/scripts/make-version-script.sh
@@ -32,8 +32,10 @@
 version_tag=$1
 
 cat << EOT
-$version_tag {
-	global:
-		*;
-};
+VERSION {
+	$version_tag {
+		global:
+			*;
+	};
+}
 EOT