diff options
| -rw-r--r-- | source3/Makefile.in | 6 | ||||
| -rw-r--r-- | source3/configure.in | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index cec09ff06b..5de5bc4dbf 100644 --- 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 81296abde0..9a4654f6b0 100644 --- 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 ################################################# |