r10482: Add files to proto_files enough to build libcli and librpc directories.

(This used to be commit 4a03773c99f81d706307d69cb14af731dc8a8783)

1 files changed, 26 insertions, 15 deletions

diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript
index 8240e0fc2b..4c715325d5 100644
--- a/source4/libcli/SConscript
+++ b/source4/libcli/SConscript
@@ -6,14 +6,19 @@ hostenv.StaticLibrary('cli_utils', cli_utils_files)
 
 hostenv.StaticLibrary('cli_lsa', ['util/clilsa.c'])
 hostenv.StaticLibrary('cli_composite_base', ['composite/composite.c'])
-hostenv.StaticLibrary('cli_composite', 
-	['composite/loadfile.c','composite/savefile.c','composite/connect.c',
+
+cli_composite_files = ['composite/loadfile.c','composite/savefile.c','composite/connect.c',
 	 'composite/sesssetup.c','composite/fetchfile.c','composite/appendacl.c',
-	 'composite/fsinfo.c'])
+	 'composite/fsinfo.c']
+
+hostenv.StaticLibrary('cli_composite', cli_composite_files)
+proto_files += ['util/clilsa.c', 'composite/composite.c'] + cli_composite_files
+
+cli_nbt_files = ['nbt/nbtname.c','nbt/nbtsocket.c','nbt/namequery.c','nbt/nameregister.c',
+	'nbt/namerefresh.c','nbt/namerelease.c']
 
-hostenv.StaticLibrary('cli_nbt',
-	['nbt/nbtname.c','nbt/nbtsocket.c','nbt/namequery.c','nbt/nameregister.c',
-	'nbt/namerefresh.c','nbt/namerelease.c'])
+hostenv.StaticLibrary('cli_nbt', cli_nbt_files)
+proto_files += cli_nbt_files
 
 hostenv.StaticLibrary('cli_dgram',
 	[ 'dgram/dgramsocket.c','dgram/mailslot.c','dgram/netlogon.c',
@@ -21,23 +26,29 @@ hostenv.StaticLibrary('cli_dgram',
 
 hostenv.StaticLibrary('cli_cldap', ['cldap/cldap.c'])
 hostenv.StaticLibrary('cli_wrepl', ['wrepl/winsrepl.c'])
-hostenv.StaticLibrary('cli_resolve', 
-	['resolve/resolve.c','resolve/nbtlist.c','resolve/bcast.c','resolve/wins.c',
-	'resolve/host.c'])
 
+cli_resolve_files = ['resolve/resolve.c','resolve/nbtlist.c','resolve/bcast.c','resolve/wins.c',
+	'resolve/host.c']
 
-hostenv.StaticLibrary('smb', 
-		['clireadwrite.c', 'cliconnect.c','clifile.c','clilist.c','clitrans2.c',
-		'climessage.c','clideltree.c'])
+hostenv.StaticLibrary('cli_resolve', cli_resolve_files)
+proto_files += cli_resolve_files
 
-hostenv.StaticLibrary('cli_raw',
-		['raw/rawfile.c','raw/smb_signing.c','raw/clisocket.c',
+smb_files = ['clireadwrite.c', 'cliconnect.c','clifile.c','clilist.c','clitrans2.c',
+		'climessage.c','clideltree.c']
+
+hostenv.StaticLibrary('smb', smb_files)
+proto_files += smb_files
+
+cli_raw_files = ['raw/rawfile.c','raw/smb_signing.c','raw/clisocket.c',
 		'raw/clitransport.c','raw/clisession.c','raw/clitree.c',
 		'raw/rawrequest.c','raw/rawreadwrite.c','raw/rawsearch.c',
 		'raw/rawsetfileinfo.c','raw/raweas.c','raw/rawtrans.c',
 		'raw/clioplock.c','raw/rawnegotiate.c','raw/rawfsinfo.c',
 		'raw/rawfileinfo.c','raw/rawnotify.c','raw/rawioctl.c',
-		'raw/rawacl.c','raw/rawdate.c','raw/rawlpq.c'])
+		'raw/rawacl.c','raw/rawdate.c','raw/rawlpq.c']
+
+hostenv.StaticLibrary('cli_raw', cli_raw_files)
+proto_files += cli_raw_files
 
 security_files = ['security/security_token.c','security/security_descriptor.c',
 			   'security/dom_sid.c', 'security/access_check.c',