From 6634360ce55a84319f197be44d47fc4f4c3ef4d5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 22 May 2012 12:01:44 +1000 Subject: [PATCH] s3-build: Remove build of libaddns.a from the autoconf build We always link libaddns statically as part of the net object lists This means that we no longer provide externally-available libaddns, as the waf build declared this as a private library. This never had a public API, .so or a header file. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Sat May 26 09:45:34 CEST 2012 on sn-devel-104 --- source3/Makefile.in | 73 -------------------------------------------- source3/configure.in | 2 -- 2 files changed, 75 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 9bd4f902bb2..ad731b37cf2 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2374,79 +2374,6 @@ showlibwbclient: showlibs:: showlibwbclient -#------------------------------------------------------------------- -# -# libaddns -# -#------------------------------------------------------------------- - - -LIBADDNS_SHARED_TARGET=@LIBADDNS_SHARED_TARGET@ -LIBADDNS_SOVER=@LIBADDNS_SOVER@ -LIBADDNS_FULLVER=@LIBADDNS_FULLVER@ -LIBADDNS_SHARED_TARGET_SONAME=@LIBADDNS_SHARED_TARGET_SOVER@ -LIBADDNS_STATIC_TARGET=@LIBADDNS_STATIC_TARGET@ -LIBADDNS=@LIBADDNS_STATIC@ @LIBADDNS_SHARED@ -#LIBADDNS_SYMS=$(srcdir)/exports/libaddns.@SYMSEXT@ - -$(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) $(LIBTALLOC) - @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \ - $(KRB5LIBS) $(UUID_LIBS) $(LIBTALLOC_LIBS) \ - @SONAMEFLAG@`basename $@` - -$(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME) - @rm -f $@ - @ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@ - -$(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0) - @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBADDNS_OBJ0) - -libaddns: $(LIBADDNS) - -cleanlibaddns:: - -rm -f \ - $(LIBADDNS_SHARED_TARGET) \ - $(LIBADDNS_SHARED_TARGET_SONAME) \ - $(LIBADDNS_STATIC_TARGET) - -installlibaddns:: installdirs libaddns - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) - @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` - -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \ - ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \ - $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \ - fi - -$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR) - -uninstalllibaddns:: - -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET_SONAME)` - -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` - -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_STATIC_TARGET)` - -libs:: libaddns -installlibs:: @INSTALL_LIBADDNS@ -uninstalllibs:: @UNINSTALL_LIBADDNS@ -cleanlibs:: cleanlibaddns -shlibs test_shlibs: @LIBADDNS_SHARED@ - -showlibaddns: - @echo "" - @echo "LIBADDNS_SHARED = @LIBADDNS_SHARED@" - @echo "LIBADDNS_STATIC = @LIBADDNS_STATIC@" - @echo "LIBADDNS_LIBS = $(LIBADDNS_LIBS)" - @echo "" - @echo "LIBADDNS_SHARED_TARGET = $(LIBADDNS_SHARED_TARGET)" - @echo "LIBADDNS_SOVER = $(LIBADDNS_SOVER)" - @echo "LIBADDNS_FULLVER = $(LIBADDNS_FULLVER)" - @echo "LIBADDNS_SHARED TARGET_SONAME = $(LIBADDNS_SHARED_TARGET_SONAME)" - @echo "LIBADDNS_STATIC_TARGET = $(LIBADDNS_STATIC_TARGET)" - @echo "LIBADDNS = $(LIBADDNS)" - -showlibs:: showlibaddns - #------------------------------------------------------------------- # # libnetapi diff --git a/source3/configure.in b/source3/configure.in index f0a76a168c7..a997e3621e8 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1987,8 +1987,6 @@ fi SMB_LIBRARY(netapi, 0) SMB_LIBRARY(smbclient, 0) SMB_LIBRARY(smbsharemodes, 0) -SMB_LIBRARY(addns, 0, [], no, [undefined API]) - ################ -- 2.34.1