Author: jerry
Date: 2006-07-19 20:54:02 +0000 (Wed, 19 Jul 2006)
New Revision: 17147

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17147

Log:
Install fixes for libraries


Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in       2006-07-19 20:53:10 UTC (rev 
17146)
+++ branches/SAMBA_3_0/source/Makefile.in       2006-07-19 20:54:02 UTC (rev 
17147)
@@ -39,6 +39,7 @@
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
 
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
@@ -115,7 +116,7 @@
 LIBSMBSHAREMODES_MAJOR=0
 LIBSMBSHAREMODES_MINOR=2
 
-FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb 
@SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_
+FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb 
@SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_ 
 FLAGS2 =
 FLAGS3 = 
 FLAGS4 = 
@@ -157,7 +158,7 @@
 EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL 
PROTECTED]@ \
        bin/[EMAIL PROTECTED]@
 
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@
+SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ 
 
 PAM_MODULES = @PAM_MODULES@
 
@@ -572,11 +573,11 @@
           utils/net_rpc_service.o utils/net_rpc_registry.o 
utils/net_usershare.o \
           utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
           utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
-          utils/passwd_util.o
+          utils/passwd_util.o  utils/net_dns.o
 
 NET_OBJ = $(NET_OBJ1) $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
          $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-         $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
+         $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)  \
          $(LIBMSRPC_OBJ) $(IDMAP_OBJ) \
          $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
          $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
@@ -693,14 +694,6 @@
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
        $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
 
-WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:[EMAIL PROTECTED]@)
-
-PICOBJS = $(SMBWRAPPER_OBJ:[EMAIL PROTECTED]@)
-LIBSMBCLIENT_PICOBJS = $(LIBSMBCLIENT_OBJ:[EMAIL PROTECTED]@)
-LIBSMBSHAREMODES_PICOBJS = $(LIBSMBSHAREMODES_OBJ:[EMAIL PROTECTED]@)
-CAC_PICOBJS = $(CAC_OBJ:[EMAIL PROTECTED]@)
-
-
 PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
                pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
                $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
@@ -744,10 +737,8 @@
 WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) 
\
                $(SECRETS_OBJ) $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) 
$(RPC_PARSE_OBJ1) $(DOSERR_OBJ)
 
-WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) lib/replace1.o @WINBIND_NSS_EXTRA_OBJS@
+WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) lib/replace1.o lib/snprintf.o 
@WINBIND_NSS_EXTRA_OBJS@
 
-WINBIND_NSS_PICOBJS = $(WINBIND_NSS_OBJ:[EMAIL PROTECTED]@) lib/[EMAIL 
PROTECTED]@
-
 POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
           popt/popthelp.o popt/poptparse.o
 
@@ -944,7 +935,7 @@
 
 bin/[EMAIL PROTECTED]@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) 
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) 
$(TERMLIBS)
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) 
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) 
$(TERMLDFLAGS) $(TERMLIBS)
 
 bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
@@ -1086,34 +1077,34 @@
        @echo Linking $@
        @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
 
-bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_PICOBJS)
+bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_OBJ:[EMAIL PROTECTED]@)
        @echo Linking libsmbclient shared library $@
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
+       @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ:[EMAIL PROTECTED]@) 
$(LDFLAGS) $(LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) \
                @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
 
-bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
+bin/libsmbclient.a: $(LIBSMBCLIENT_OBJ:[EMAIL PROTECTED]@)
        @echo Linking libsmbclient non-shared library $@
-       @-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
+       @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ:[EMAIL PROTECTED]@)
 
-bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
+bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_OBJ:[EMAIL PROTECTED]@)
        @echo Linking libsmbsharemodes shared library $@
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS) 
$(LIBS) \
+       @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ:[EMAIL PROTECTED]@) 
$(LDFLAGS) $(LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) \
                @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
 
-bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
+bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_OBJ:[EMAIL PROTECTED]@)
        @echo Linking libsmbsharemodes non-shared library $@
-       @-$(AR) -rc $@ $(LIBSMBSHAREMODES_PICOBJS)
+       @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ:[EMAIL PROTECTED]@)
 
-bin/[EMAIL PROTECTED]@: $(CAC_PICOBJS)
+bin/[EMAIL PROTECTED]@: $(CAC_OBJ:[EMAIL PROTECTED]@)
        @echo Linking libmsrpc shared library $@
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
+       @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ:[EMAIL PROTECTED]@) $(LDFLAGS) 
$(LIBS) \
        @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR)
 
-bin/libmsrpc.a: $(CAC_PICOBJS)
+bin/libmsrpc.a: $(CAC_OBJ:[EMAIL PROTECTED]@)
        @echo Linking libmsrpc non-shared library $@
-       @-$(AR) -rc $@ $(CAC_PICOBJS)
+       @-$(AR) -rc $@ $(CAC_OBJ:[EMAIL PROTECTED]@)
 
 # This is probably wrong for anything other than the GNU linker. 
 bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
@@ -1210,14 +1201,14 @@
 # Please don't add .o files to libnss_winbind, libnss_wins, or the pam_winbind
 # libraries.  Add to the appropriate PICOBJ variable instead.
 
[EMAIL PROTECTED]@: $(WINBIND_NSS_PICOBJS)
[EMAIL PROTECTED]@: $(WINBIND_NSS_OBJ:[EMAIL PROTECTED]@)
        @echo "Linking $@"
-       @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
+       @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ:[EMAIL 
PROTECTED]@) \
                @WINBIND_NSS_EXTRA_LIBS@ @[EMAIL PROTECTED] [EMAIL 
PROTECTED]@NSSSONAMEVERSIONSUFFIX@
 
[EMAIL PROTECTED]@: $(WINBIND_WINS_NSS_PICOBJS)
[EMAIL PROTECTED]@: $(WINBIND_WINS_NSS_OBJ:[EMAIL PROTECTED]@)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
+       @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ:[EMAIL PROTECTED]@) \
                $(LDAP_LIBS) $(KRB5LIBS) \
                @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@
 
@@ -1433,8 +1424,9 @@
        @echo Linking $@
        @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
 
-install: installservers installbin @INSTALL_CIFSMOUNT@ installman 
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ 
@INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
+install: installservers installbin @INSTALL_CIFSMOUNT@ installman 
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ 
@INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ 
 
+
 install-everything: install installmodules
 
 # DESTDIR is used here to prevent packagers wasting their time
@@ -1499,6 +1491,11 @@
        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) 
${prefix}/include
        -$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include
 
+installlibsmbsharemodes: installdirs libsmbsharemodes
+       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) 
$(LIBDIR)
+       -$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
+       -$(INSTALLLIBCMD_A) bin/libsmbsharemodes.a $(DESTDIR)$(LIBDIR)
+
 installpammodules: $(PAM_MODULES)
        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) 
$(PAMMODULESDIR)
        @for module in $(PAM_MODULES); do \
@@ -1563,7 +1560,7 @@
        @echo "  swatdir:     $(SWATDIR)"
 
 
-uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ 
uninstallscripts uninstalldat uninstallswat uninstallmodules 
@UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@
+uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ 
uninstallscripts uninstalldat uninstallswat uninstallmodules 
@UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@ 
@UNINSTALL_LIBSMBSHAREMODES@ 
 
 uninstallman:
        @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) 
$(srcdir) C
@@ -1597,16 +1594,20 @@
 uninstallswat: uninstallmsg
        @$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) 
$(srcdir)
 
-uninstallclientlib: installdirs libsmbclient
+uninstallclientlib: 
        -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/[EMAIL PROTECTED]@
        -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbclient.a
        -rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
 
-uninstalllibmsrpc: installdirs libmsrpc
+uninstalllibmsrpc: 
        -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/[EMAIL PROTECTED]@
        -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libmsrpc.a
        -rm -f $(DESTDIR)${prefix}/include/libmsrpc.h
 
+uninstalllibsmbsharemodes: 
+       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/[EMAIL PROTECTED]@
+       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbsharemodes.a
+
 uninstallpammodules:
        @for module in $(PAM_MODULES); do \
                echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/[EMAIL PROTECTED]@ 
"; \

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in      2006-07-19 20:53:10 UTC (rev 
17146)
+++ branches/SAMBA_3_0/source/configure.in      2006-07-19 20:54:02 UTC (rev 
17147)
@@ -264,6 +264,7 @@
 AC_SUBST(LIBSMBCLIENT_SHARED)
 AC_SUBST(LIBSMBCLIENT)
 AC_SUBST(INSTALL_LIBSMBSHAREMODES)
+AC_SUBST(UNINSTALL_LIBSMBSHAREMODES)
 AC_SUBST(LIBSMBSHAREMODES_SHARED)
 AC_SUBST(LIBSMBSHAREMODES)
 AC_SUBST(PRINT_LIBS)
@@ -272,6 +273,7 @@
 AC_SUBST(PASSDB_LIBS)
 AC_SUBST(IDMAP_LIBS)
 AC_SUBST(KRB5_LIBS)
+AC_SUBST(UUID_LIBS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(SHLIB_PROGS)
 AC_SUBST(PAM_MODULES)
@@ -3786,6 +3788,7 @@
 
 AC_CHECK_LIB_EXT(nscd, NSCD_LIBS, nscd_flush_cache)
 
+
 #################################################
 # check for automount support
 AC_MSG_CHECKING(whether to use automount)
@@ -4401,6 +4404,7 @@
   UNINSTALL_LIBMSRPC=uninstalllibmsrpc
 )
 
+
 #################################################
 # should we build libsmbclient?
 INSTALL_LIBSMBCLIENT=
@@ -4470,6 +4474,7 @@
         LIBSMBSHAREMODES=libsmbsharemodes
      fi
      INSTALL_LIBSMBSHAREMODES=installlibsmbsharemodes
+     UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
      ;;
   esac ],
 [

Reply via email to