diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-06 23:37:06 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:34:01 +0200 |
| commit | 2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda (patch) | |
| tree | 6c593a1f119920b7d8a4057e07a73cdc477c8bfb /source3/Makefile.in | |
| parent | c9178983e82e91104028e01c2550a05a5bc8666e (diff) | |
| download | samba-2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda.tar.gz samba-2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda.tar.bz2 samba-2e694978f5a21cfd8ce21f5a34ab5bd4ad817dda.zip | |
build: slightly change and extend the logic of SMB_LIBRARY().
Only call the install/uninstall targets (from make (un)install)
for libraries configured with SMB_LIBRARY(), when the user did
not set --with-libname=no.
Make sure to always (at least) build the static version of the library.
Michael
(This used to be commit f440538c9480134ff05cf9c9f78a565808161101)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index df5ec7ff3f..eb9a6a26ee 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2311,10 +2311,10 @@ bin/rpc_open_tcp@EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) @LIBTALLOC_SHARE install:: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSSPNEGO@ installman \ installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \ - installlibtalloc \ - installlibtdb \ + @INSTALL_LIBTALLOC@ \ + @INSTALL_LIBTDB@ \ @INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ \ - @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ installlibnetapi + @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ @INSTALL_LIBNETAPI@ install-everything:: install installmodules @@ -2419,7 +2419,7 @@ showlayout:: @echo " swatdir: $(SWATDIR)" -uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibtalloc uninstalllibtdb @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ uninstalllibnetapi uninstalllibwbclient +uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBTALLOC@ @UNINSTALL_LIBTDB@ @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ @UNINSTALL_LIBNETAPI@ uninstalllibwbclient uninstallman:: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C |