Remove some unneded variables: we always build and install some talloc libs.

LIBTALLOC, INSTALL_LIBTALLOC, UNINSTALL_LIBTALLOC

Michael
(This used to be commit 97a60565ad6657af8e4a3b8b38b69b48597e3eec)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index cec09ff06ba08e6249b50e7f03017c2f95c6aebe..5de5bc4dbf4754f21ccac199de5733a10d8a6589 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -206,7 +206,7 @@ EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
        bin/log2pcap@EXEEXT@ bin/sharesec@EXEEXT@ bin/ndrdump@EXEEXT@ \
        bin/vlp@EXEEXT@
 
-SHLIBS = @LIBTALLOC@ @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ @LIBNETAPI@
+SHLIBS = libtalloc @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ @LIBNETAPI@
 
 PAM_MODULES = @PAM_MODULES@
 
@@ -1886,7 +1886,7 @@ bin/timelimit@EXEEXT@: script/tests/timelimit.o
 
 install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSSPNEGO@ installman \
                installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \
-               @INSTALL_LIBTALLOC@ \
+               installlibtalloc \
                @INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ \
                @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ @INSTALL_LIBNETAPI@
 
@@ -2018,7 +2018,7 @@ showlayout:
        @echo "  swatdir:     $(SWATDIR)"
 
 
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBTALLOC@ @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ @UNINSTALL_LIBNETAPI@
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibtalloc @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ @UNINSTALL_LIBNETAPI@
 
 uninstallman:
        @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C

diff --git a/source3/configure.in b/source3/configure.in
index 81296abde055f24fd865c9ac0363dbba44c0c682..9a4654f6b03d92d4e1d51d596879b336838392f5 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -334,10 +334,7 @@ AC_SUBST(LIBADDNS)
 
 AC_SUBST(LIBTALLOC_STATIC_TARGET)
 AC_SUBST(LIBTALLOC_SHARED_TARGET)
-AC_SUBST(INSTALL_LIBTALLOC)
-AC_SUBST(UNINSTALL_LIBTALLOC)
 AC_SUBST(LIBTALLOC_SHARED)
-AC_SUBST(LIBTALLOC)
 AC_SUBST(LIBTALLOC_STATIC)
 AC_SUBST(LIBTALLOC_LIBS)
 
@@ -5164,12 +5161,9 @@ AC_ARG_WITH([static-libs],
 
 #################################################
 # should we build libtalloc?
-INSTALL_LIBTALLOC=
-UNINSTALL_LIBTALLOC=
 LIBTALLOC_SHARED_TARGET=bin/libtalloc.$SHLIBEXT
 LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
 LIBTALLOC_SHARED=
-LIBTALLOC=
 LIBTALLOC_STATIC=
 LIBTALLOC_LIBS=
 
@@ -5208,9 +5202,6 @@ fi
 if test $enable_static = yes; then
        LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET
 fi
-LIBTALLOC=libtalloc
-INSTALL_LIBTALLOC=installlibtalloc
-UNINSTALL_LIBTALLOC=uninstalllibtalloc
 
 
 #################################################