From 27ca5cd80afda786e65202ee10d5a9f6e002accf Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 6 Jul 2008 02:29:02 +0200 Subject: build: fix creation of talloc shared lib. link the libtalloc.so.1 file and create libtalloc.so as a link Michael (This used to be commit 946537e6bec904d4a7937eeb6085dfac19c3e2b5) --- source3/Makefile.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index ca999a01ec..9c2100b4c1 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -144,6 +144,8 @@ CODEPAGEDIR = @codepagedir@ PIDDIR = @piddir@ LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@ +LIBTALLOC_SHARED_SOVER=$(shell grep \^$(LIBTALLOC_SHARED_TARGET) $(builddir)/library-versions | cut -d: -f2) +LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SHARED_SOVER) LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@ LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@ LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@ @@ -1608,11 +1610,12 @@ MKSYMS_SH = $(srcdir)/script/mksyms.sh $(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS) @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS) -$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS) +$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS) @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBTALLOC_OBJ) \ - @SONAMEFLAG@`basename $@`.$(SONAME_VER) - @ln -s -f `basename $@` $@.$(SONAME_VER) + @$(SHLD_DSO) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@` + +$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME) + @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) @echo Linking non-shared library $@ -- cgit