Author: jerry Date: 2007-08-29 19:03:20 +0000 (Wed, 29 Aug 2007) New Revision: 24788
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24788 Log: Cleanup some linking msgs and remove references to libmsrpc in SAMBA_3_2_0 Modified: branches/SAMBA_3_2/source/Makefile.in branches/SAMBA_3_2_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_2/source/Makefile.in =================================================================== --- branches/SAMBA_3_2/source/Makefile.in 2007-08-29 17:14:54 UTC (rev 24787) +++ branches/SAMBA_3_2/source/Makefile.in 2007-08-29 19:03:20 UTC (rev 24788) @@ -187,7 +187,7 @@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ -SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@ +SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ PAM_MODULES = @PAM_MODULES@ @@ -1006,9 +1006,6 @@ modules: SHOWFLAGS $(MODULES) -cac: SHOWFLAGS $(LIBMSRPC) - - ##################################################################### ## Perl IDL Compiler IDL_FILES = unixinfo.idl lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \ @@ -1352,47 +1349,47 @@ @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) - @echo Linking libaddns shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \ $(KRB5LIBS) $(UUID_LIBS)\ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) - @echo Linking libaddns non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) - @echo Linking libsmbclient shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) - @echo Linking libsmbclient non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) - @echo Linking libsmbsharemodes shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) - @echo Linking libsmbsharemodes non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(CAC_OBJ) - @echo Linking libmsrpc shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(CAC_OBJ) $(LDFLAGS) $(LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libmsrpc.a: $(BINARY_PREREQS) $(CAC_OBJ) - @echo Linking libmsrpc non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(CAC_OBJ) # This is probably wrong for anything other than the GNU linker. bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) - @echo Linking bigballofmud shared library $@ + @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR) @@ -1405,7 +1402,6 @@ libsmbclient: $(LIBSMBCLIENT) libsmbsharemodes: $(LIBSMBSHAREMODES) -libmsrpc: $(LIBMSRPC) libaddns: $(LIBADDNS) # Linker command to link a RPC, VFS, AUTH, CHARSET or PASSDB module. @@ -1744,7 +1740,7 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o -install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ @INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ install-everything: install installmodules @@ -1808,13 +1804,6 @@ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include -installlibmsrpc: installdirs libmsrpc - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR) - -$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR) - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include - installlibsmbsharemodes: installdirs libsmbsharemodes @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR) @@ -1890,7 +1879,7 @@ @echo " swatdir: $(SWATDIR)" -uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ +uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ uninstallman: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C @@ -1929,11 +1918,6 @@ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbclient.a -rm -f $(DESTDIR)${prefix}/include/libsmbclient.h -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 @@ -1959,7 +1943,7 @@ */[EMAIL PROTECTED]@ */*/[EMAIL PROTECTED]@ */*/*/[EMAIL PROTECTED]@ \ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \ - $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ + $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) \ .headers.stamp */src/*.o proto_exists -rm -rf t_dir Modified: branches/SAMBA_3_2_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_2_0/source/Makefile.in 2007-08-29 17:14:54 UTC (rev 24787) +++ branches/SAMBA_3_2_0/source/Makefile.in 2007-08-29 19:03:20 UTC (rev 24788) @@ -181,7 +181,7 @@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ -SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@ +SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ PAM_MODULES = @PAM_MODULES@ @@ -992,9 +992,6 @@ modules: SHOWFLAGS $(MODULES) -cac: SHOWFLAGS $(LIBMSRPC) - - ##################################################################### ## Perl IDL Compiler IDL_FILES = unixinfo.idl lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \ @@ -1310,38 +1307,38 @@ @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) - @echo Linking libaddns shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \ $(KRB5LIBS) $(UUID_LIBS)\ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) - @echo Linking libaddns non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) - @echo Linking libsmbclient shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) - @echo Linking libsmbclient non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) - @echo Linking libsmbsharemodes shared library $@ + @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) - @echo Linking libsmbsharemodes non-shared library $@ + @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ) # This is probably wrong for anything other than the GNU linker. bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) - @echo Linking bigballofmud shared library $@ + @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR) @@ -1354,7 +1351,6 @@ libsmbclient: $(LIBSMBCLIENT) libsmbsharemodes: $(LIBSMBSHAREMODES) -libmsrpc: $(LIBMSRPC) libaddns: $(LIBADDNS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(RPC_LSA_OBJ) @@ -1738,7 +1734,7 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o -install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ @INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ install-everything: install installmodules @@ -1800,13 +1796,6 @@ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include -installlibmsrpc: installdirs libmsrpc - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR) - -$(INSTALLLIBCMD_A) bin/libmsrpc.a $(DESTDIR)$(LIBDIR) - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include - installlibsmbsharemodes: installdirs libsmbsharemodes @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR) @@ -1881,7 +1870,7 @@ @echo " swatdir: $(SWATDIR)" -uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ +uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@ uninstallman: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C @@ -1920,11 +1909,6 @@ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbclient.a -rm -f $(DESTDIR)${prefix}/include/libsmbclient.h -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 @@ -1949,7 +1933,7 @@ */[EMAIL PROTECTED]@ */*/[EMAIL PROTECTED]@ */*/*/[EMAIL PROTECTED]@ \ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \ - $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ + $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) \ .headers.stamp */src/*.o proto_exists -rm -rf t_dir
