svn commit: samba r10586 - in branches/SAMBA_4_0/source: . auth auth/gensec build/scons cldap_server dsdb gtk heimdal_build kdc ldap_server lib lib/appweb lib/charset lib/cmdline lib/com lib/events lib/ldb lib/messaging lib/netif lib/popt lib/registry lib/replace lib/samba3 lib/socket lib/socket_wrapper lib/talloc lib/tdb lib/tls libcli libnet librpc nbt_server nsswitch ntptr ntvfs ntvfs/posix ntvfs/unixuid param rpc_server scripting/ejs smb_server smbd torture web_server winbind

[jelmer at samba.org]

Author: jelmer
Date: 2005-09-28 18:18:09 +0000 (Wed, 28 Sep 2005)
New Revision: 10586

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

Log:
Add MergedObject() builder. Default to Library() rather 
then StaticLibrary()

Added:
   branches/SAMBA_4_0/source/build/scons/samba.py
Modified:
   branches/SAMBA_4_0/source/SConstruct
   branches/SAMBA_4_0/source/auth/SConscript
   branches/SAMBA_4_0/source/auth/gensec/SConscript
   branches/SAMBA_4_0/source/cldap_server/SConscript
   branches/SAMBA_4_0/source/dsdb/SConscript
   branches/SAMBA_4_0/source/gtk/SConscript
   branches/SAMBA_4_0/source/heimdal_build/SConscript
   branches/SAMBA_4_0/source/kdc/SConscript
   branches/SAMBA_4_0/source/ldap_server/SConscript
   branches/SAMBA_4_0/source/lib/SConscript
   branches/SAMBA_4_0/source/lib/appweb/SConscript
   branches/SAMBA_4_0/source/lib/charset/SConscript
   branches/SAMBA_4_0/source/lib/cmdline/SConscript
   branches/SAMBA_4_0/source/lib/com/SConscript
   branches/SAMBA_4_0/source/lib/events/SConscript
   branches/SAMBA_4_0/source/lib/ldb/SConscript
   branches/SAMBA_4_0/source/lib/messaging/SConscript
   branches/SAMBA_4_0/source/lib/netif/SConscript
   branches/SAMBA_4_0/source/lib/popt/SConscript
   branches/SAMBA_4_0/source/lib/registry/SConscript
   branches/SAMBA_4_0/source/lib/replace/SConscript
   branches/SAMBA_4_0/source/lib/samba3/SConscript
   branches/SAMBA_4_0/source/lib/socket/SConscript
   branches/SAMBA_4_0/source/lib/socket_wrapper/SConscript
   branches/SAMBA_4_0/source/lib/talloc/SConscript
   branches/SAMBA_4_0/source/lib/tdb/SConscript
   branches/SAMBA_4_0/source/lib/tls/SConscript
   branches/SAMBA_4_0/source/libcli/SConscript
   branches/SAMBA_4_0/source/libnet/SConscript
   branches/SAMBA_4_0/source/librpc/SConscript
   branches/SAMBA_4_0/source/nbt_server/SConscript
   branches/SAMBA_4_0/source/nsswitch/SConscript
   branches/SAMBA_4_0/source/ntptr/SConscript
   branches/SAMBA_4_0/source/ntvfs/SConscript
   branches/SAMBA_4_0/source/ntvfs/posix/SConscript
   branches/SAMBA_4_0/source/ntvfs/unixuid/SConscript
   branches/SAMBA_4_0/source/param/SConscript
   branches/SAMBA_4_0/source/rpc_server/SConscript
   branches/SAMBA_4_0/source/scripting/ejs/SConscript
   branches/SAMBA_4_0/source/smb_server/SConscript
   branches/SAMBA_4_0/source/smbd/SConscript
   branches/SAMBA_4_0/source/torture/SConscript
   branches/SAMBA_4_0/source/web_server/SConscript
   branches/SAMBA_4_0/source/winbind/SConscript


Changeset:
Sorry, the patch is too large (996 lines) to include; please use WebSVN to see it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10586