]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
build: fix creation of the libtdb shared library.
authorMichael Adam <obnox@samba.org>
Sun, 6 Jul 2008 12:32:36 +0000 (14:32 +0200)
committerMichael Adam <obnox@samba.org>
Mon, 7 Jul 2008 18:33:59 +0000 (20:33 +0200)
Create the libtdb.so.1 file and create the .so file as the symlink.
Not vice versa.

Michael

source/Makefile.in

index e69774c3c32b66a91f063d0f64e6ceeb0acfea3a..93432cde084ced3f8b5de0ceb251fabab44b44f4 100644 (file)
@@ -1606,8 +1606,8 @@ LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
 LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
 
 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_SOVER=$(shell grep \^$(LIBTALLOC_SHARED_TARGET) $(builddir)/library-versions | cut -d: -f2)
+LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
 LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
 LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
 LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
@@ -1666,6 +1666,8 @@ LIBTDB_OBJ0 = @TDB_OBJS@
 LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
 LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
+LIBTDB_SOVER=$(shell grep \^$(LIBTDB_SHARED_TARGET) $(builddir)/library-versions | cut -d: -f2)
+LIBTDB_SHARED_TARGET_SONAME=$(LIBTDB_SHARED_TARGET).$(LIBTDB_SOVER)
 LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
 LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
 LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@
@@ -1676,11 +1678,14 @@ libtdb: $(LIBTDB)
 $(LIBTDB_SYMS): $(LIBTDB_HEADERS)
        @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
 
-$(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
+$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
        @echo Linking shared library $@
        @$(SHLD_DSO) $(LIBTDB_OBJ) \
-               @SONAMEFLAG@`basename $@`.$(SONAME_VER)
-       @ln -s -f `basename $@` $@.$(SONAME_VER)
+               @SONAMEFLAG@`basename $@`
+
+$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
+       @rm -f $@
+       @ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
        @echo Linking non-shared library $@