sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

s3-build: Remove build of libtalloc.so from the autoconf build

Browse Source 
We now either link talloc statically or we use the system provided talloc

This means that we now only have one build system for externally-available
talloc, which in turn ensures we have a consistent shared library built as
libtalloc.so

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-05-22 11:55:49 +10:00
parent 53d4ffcc22
commit ac63b55033
2 changed files with 3 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
source3/Makefile.in
View File

@ -109,7 +109,7 @@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
DNSSD_LIBS=@DNSSD_LIBS@
AVAHI_LIBS=@AVAHI_LIBS@
POPT_LIBS=@POPTLIBS@
LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
LIBTALLOC=@LIBTALLOC_STATIC@
LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
@ -2102,30 +2102,7 @@ MKSYMS_SH = $(srcdir)/script/mksyms.sh
LIBTALLOC_OBJ0 = @LIBTALLOC_OBJ0@
LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
LIBTALLOC_FULLVER=@LIBTALLOC_FULLVER@
LIBTALLOC_SHARED_TARGET_SONAME=@LIBTALLOC_SHARED_TARGET_SOVER@
LIBTALLOC_SHARED_TARGET_FULLVER=@LIBTALLOC_SHARED_TARGET_FULLVER@
LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBTALLOC_OBJ) $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
$(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)` $@
$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
@echo Linking non-shared library $@
@ -2134,51 +2111,14 @@ libtalloc: $(LIBTALLOC)
cleanlibtalloc::
-rm -f \
$(LIBTALLOC_SYMS) \
$(LIBTALLOC_STATIC_TARGET) \
$(LIBTALLOC_SHARED_TARGET) \
$(LIBTALLOC_SHARED_TARGET_SONAME)
installlibtalloc:: installdirs libtalloc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
-if test -r $(LIBTALLOC_SHARED_TARGET_FULLVER) ; then \
ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_FULLVER)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)` ; \
fi
-if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
fi
-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
uninstalllibtalloc::
-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
-rm -f $(DESTDIR)${prefix}/include/talloc.h
$(LIBTALLOC_STATIC_TARGET)
libs:: libtalloc
installlibs:: @INSTALL_LIBTALLOC@
uninstalllibs:: @UNINSTALL_LIBTALLOC@
cleanlibs:: cleanlibtalloc
shlibs test_shlibs: @LIBTALLOC_SHARED@
showlibtalloc:
@echo ""
@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_SHARED TARGET_FULLVER = $(LIBTALLOC_SHARED_TARGET_FULLVER)"
@echo "LIBTALLOC_STATIC_TARGET = $(LIBTALLOC_STATIC_TARGET)"
@echo "LIBTALLOC = $(LIBTALLOC)"

4
source3/configure.in
View File

@ -1915,9 +1915,7 @@ fi
if test "x$enable_external_libtalloc" = xno
then
m4_include(../lib/talloc/libtalloc.m4)
if test x"$USESHARED" == x"no" ; then
LINK_LIBTALLOC=STATIC
fi
LINK_LIBTALLOC=STATIC
LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
SMB_LIBRARY(talloc, 2, ${LIBTALLOCVERSION})
LIBTALLOC_OBJ0=""