summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-06 02:29:02 +0200
committerMichael Adam <obnox@samba.org>2008-07-07 20:33:58 +0200
commit27ca5cd80afda786e65202ee10d5a9f6e002accf (patch)
tree1296c8a2c441a2a5004f2d5ce8d0ee1d6b31a649 /source3/Makefile.in
parentef6619fc3c59db99ab6c2e7d2899b5e8e85d993f (diff)
downloadsamba-27ca5cd80afda786e65202ee10d5a9f6e002accf.tar.gz
samba-27ca5cd80afda786e65202ee10d5a9f6e002accf.tar.bz2
samba-27ca5cd80afda786e65202ee10d5a9f6e002accf.zip
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)
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in11
1 files changed, 7 insertions, 4 deletions
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 $@