diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-06 14:32:36 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:33:59 +0200 |
| commit | b6222766551545cd231cb998b073aac2d8c7583c (patch) | |
| tree | 4b93c9b7f429152aeb8374a2837a74bb6567f117 | |
| parent | 9bce1354b66c2637d9ca5b585eb164baa4fed114 (diff) | |
| download | samba-b6222766551545cd231cb998b073aac2d8c7583c.tar.gz samba-b6222766551545cd231cb998b073aac2d8c7583c.tar.bz2 samba-b6222766551545cd231cb998b073aac2d8c7583c.zip | |
build: fix creation of the libtdb shared library.
Create the libtdb.so.1 file and create the .so file as the symlink.
Not vice versa.
Michael
(This used to be commit 662d666b41b11ae70daf7422b1ced5f86209e608)
| -rw-r--r-- | source3/Makefile.in | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index e69774c3c3..93432cde08 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -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 $@ |