summaryrefslogtreecommitdiff
path: root/source4/lib/SConscript
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-24 16:23:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:52 -0500
commit3d4ea18d4dd9031adc16348c16595d6c216b2d84 (patch)
treeb43aba2aff1820c4ed365132cc2feca544ed402a /source4/lib/SConscript
parent63b43dd12fb579aaaccedd07aaa630cb1cd7aa88 (diff)
downloadsamba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.tar.gz
samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.tar.bz2
samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.zip
r10478: More work on proto headers; we now generate a couple of smaller ones
that are then included by include/proto.h (This used to be commit 703ffbaaaca11f3d8781cfe9e7542fcaa626d991)
Diffstat (limited to 'source4/lib/SConscript')
-rw-r--r--source4/lib/SConscript14
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index 328d6233e4..caeeea5712 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -2,7 +2,7 @@ Import('hostenv')
# tastes like -*- python -*-
SConscript(dirs=['talloc','charset'])
-Import('talloc', 'dynconfig', 'charset', 'proto_files')
+Import('talloc', 'dynconfig', 'charset')
basic_files = ['version.c', 'xfile.c', 'debug.c', 'fault.c',
'signal.c', 'system.c', 'time.c', 'genrand.c', 'dprintf.c',
@@ -11,7 +11,7 @@ basic_files = ['version.c', 'xfile.c', 'debug.c', 'fault.c',
'fsusage.c', 'ms_fnmatch.c', 'select.c', 'mutex.c', 'idtree.c',
'db_wrap.c']
-proto_files += [File(x) for x in basic_files]
+proto_files = basic_files
basic = hostenv.StaticLibrary('basic', [dynconfig,charset,talloc,basic_files])
Export('basic')
@@ -29,11 +29,17 @@ hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
SConscript(dirs=['ldb'])
Import('ldb')
-gendb = hostenv.StaticLibrary('gendb', ['gendb.c',ldb])
+gendb_files = ['gendb.c']
+proto_files += gendb_files
+gendb = hostenv.StaticLibrary('gendb', [gendb_files,ldb])
Export('gendb')
-credentials = hostenv.StaticLibrary('credentials',['credentials.c',basic,gendb])
+credentials_files = ['credentials.c']
+proto_files += credentials_files
+credentials = hostenv.StaticLibrary('credentials',[credentials_files,basic,gendb])
Export('credentials')
+hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
+
SConscript(dirs=['../param/','replace','tdb','popt','cmdline','registry', 'tls','samba3','socket','socket_wrapper','messaging','com','events', 'appweb'])