From d04efc703ba0f195fcef832a30b27a160a787413 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 6 May 2011 17:00:32 +0200 Subject: s3:build: build libtalloc.so.$VERSION with full version number instead only SO version --- source3/Makefile.in | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index fb68154423..032232d14b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2032,6 +2032,7 @@ LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@ LIBTALLOC_SOVER=@LIBTALLOC_SOVER@ LIBTALLOC_FULLVER=@LIBTALLOC_FULLVER@ LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER) +LIBTALLOC_SHARED_TARGET_FULLVER=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_FULLVER) LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@ LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@ LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h @@ -2043,7 +2044,12 @@ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLO @echo Linking shared library $@ @$(SHLD_DSO) $(LIBTALLOC_OBJ) $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@` -$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME) +$(LIBTALLOC_SHARED_TARGET_FULLVER): $(LIBTALLOC_SHARED_TARGET_SONAME) + @rm -f $@ + @mv -f $(LIBTALLOC_SHARED_TARGET_SONAME) $@ + @ln -f -s `basename $@` $(LIBTALLOC_SHARED_TARGET_SONAME) + +$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_FULLVER) @rm -f $@ @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@ @@ -2085,16 +2091,17 @@ shlibs test_shlibs: @LIBTALLOC_SHARED@ showlibtalloc: @echo "" - @echo "LIBTALLOC_SHARED = @LIBTALLOC_SHARED@" - @echo "LIBTALLOC_STATIC = @LIBTALLOC_STATIC@" - @echo "LIBTALLOC_LIBS = $(LIBTALLOC_LIBS)" + @echo "LIBTALLOC_SHARED = @LIBTALLOC_SHARED@" + @echo "LIBTALLOC_STATIC = @LIBTALLOC_STATIC@" + @echo "LIBTALLOC_LIBS = $(LIBTALLOC_LIBS)" @echo "" - @echo "LIBTALLOC_SHARED_TARGET = $(LIBTALLOC_SHARED_TARGET)" - @echo "LIBTALLOC_SOVER = $(LIBTALLOC_SOVER)" - @echo "LIBTALLOC_FULLVER = $(LIBTALLOC_FULLVER)" - @echo "LIBTALLOC_SHARED TARGET_SONAME = $(LIBTALLOC_SHARED_TARGET_SONAME)" - @echo "LIBTALLOC_STATIC_TARGET = $(LIBTALLOC_STATIC_TARGET)" - @echo "LIBTALLOC = $(LIBTALLOC)" + @echo "LIBTALLOC_SHARED_TARGET = $(LIBTALLOC_SHARED_TARGET)" + @echo "LIBTALLOC_SOVER = $(LIBTALLOC_SOVER)" + @echo "LIBTALLOC_FULLVER = $(LIBTALLOC_FULLVER)" + @echo "LIBTALLOC_SHARED TARGET_SONAME = $(LIBTALLOC_SHARED_TARGET_SONAME)" + @echo "LIBTALLOC_SHARED TARGET_FULLVER = $(LIBTALLOC_SHARED_TARGET_FULLVER)" + @echo "LIBTALLOC_STATIC_TARGET = $(LIBTALLOC_STATIC_TARGET)" + @echo "LIBTALLOC = $(LIBTALLOC)" showlibs:: showlibtalloc -- cgit