From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 23 Jul 1999 17:31:32 +0000 (+0000)
Subject: Update libtool LTLIBLINK vs LTLINK -version-info handling... (from -devel)
X-Git-Tag: OPENLDAP_REL_ENG_1_2_5~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=422b9b389d416f3dd30299807ce846176cfba525;p=thirdparty%2Fopenldap.git

Update libtool LTLIBLINK vs LTLINK -version-info handling... (from -devel)
---

diff --git a/CHANGES b/CHANGES
index 8bed41e67a..245fa7a4ba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ Changes included in OpenLDAP 1.2 Release Engineering
 		Updated to latest Autoconf (AnonCVS)
 		Updated to latest aclocal from Automake (AnonCVS)
 		Updated to libtool-1.3.3.
+		Updated libtool -version-info handling
 		Don't use "ln -s -f file link" (ITS#227)
 	Documentation
 		Added -n option to ldif2ldbm(8) (ITS#59)
diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index 59fc6e9637..9a11df107a 100644
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@@ -6,8 +6,6 @@
 ## Makefile Template for Shared Libraries
 ##
 
-LTVERSION = -version-info $(LIBVERSION)
-LINK    = $(LTLINK)
 COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c
 MKDEPFLAG = -l
 
@@ -17,7 +15,7 @@ MKDEPFLAG = -l
 	$(COMPILE) $<
 
 $(LIBRARY):  version.lo
-	$(LINK) -rpath $(libdir) -o $@ $(OBJS) version.lo
+	$(LTLIBLINK) -rpath $(libdir) -o $@ $(OBJS) version.lo
 	$(RM) ../$@;	\
 	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
 	$(RM) ../`$(BASENAME) $@ .la`.a;	\
diff --git a/build/top.mk b/build/top.mk
index 8efa2fadf7..505ae4beef 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -53,7 +53,9 @@ MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 1:0:0
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
+LTVERSION = -version-info $(LIBVERSION)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
+LTLIBLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in makefiles