16 files changed, 24 insertions, 31 deletions
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index 516537cac0..b3d949d12e 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -1,8 +1,8 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 basic = hostenv.StaticLibrary('basic', 
-	['version.c', 'xfile.c', 'debug.c', 'fault.c', 'pidfile.c',
+	['version.c', 'xfile.c', 'debug.c', 'fault.c', 
 	 'signal.c', 'system.c', 'time.c', 'genrand.c', 'dprintf.c',
 	 'util_str.c', 'util_strlist.c', 'util_unistr.c', 'util_file.c',
 	 'data_blob.c', 'util.c', 'util_sock.c', 'substitute.c', 
@@ -20,6 +20,6 @@ hostenv.StaticLibrary('gencache',['gencache.c'])
 hostenv.StaticLibrary('pidfile',['pidfile.c'])
 hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
 
-SConscript(dirs=['replace','tdb','popt','cmdline','talloc','registry','charset',
-		   'ldb','tls','samba3','socket','socket_wrapper','messaging'],
+SConscript(dirs=['replace','tdb','popt','cmdline','talloc','registry','charset', 'ldb','tls','samba3','socket','socket_wrapper','messaging','com','events',
+		   'appweb'],
 		   exports='hostenv')
diff --git a/source4/lib/appweb/SConscript b/source4/lib/appweb/SConscript
new file mode 100644
index 0000000000..2c8238b67c
--- /dev/null
+++ b/source4/lib/appweb/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('mpr',['mpr/miniMpr.c','mpr/var.c'])
+hostenv.StaticLibrary('ejs',['ejs/ejsLib.c','ejs/ejsLex.c','ejs/ejsParser.c','ejs/ejsProcs.c'])
+hostenv.StaticLibrary('esp',['esp/esp.c','esp/espProcs.c'])
diff --git a/source4/lib/appweb/ejs/config.mk b/source4/lib/appweb/ejs/config.mk
deleted file mode 100644
index f2c0e62f1e..0000000000
--- a/source4/lib/appweb/ejs/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#######################
-# Start SUBSYSTEM EJS
-[SUBSYSTEM::EJS]
-ADD_OBJ_FILES = \
-		lib/ejs/ejsLib.o  \
-		lib/ejs/ejsLex.o \
-		lib/ejs/ejsParser.o \
-		lib/ejs/ejsProcs.o \
-		lib/ejs/miniMpr.o \
-		lib/ejs/var.o
-NOPROTO=YES
-# End SUBSYSTEM EJS
-#######################
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index 7d9044d547..53e5db44bb 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,8 +1,8 @@
+Import('hostenv')
 SConscript('../../build/scons/iconv.py')
 #            tastes like -*- python -*-
-Import('hostenv')
 
-#conf = Configure(hostenv, custom_tests = { 'CheckIconv' : CheckIconv })
+#conf = Configure( custom_tests = { 'CheckIconv' : CheckIconv })
 #(have_iconv,iconv) = conf.CheckIconv()
 #conf.Finish()
 
diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript
index 724dc07821..a99a2b4892 100644
--- a/source4/lib/cmdline/SConscript
+++ b/source4/lib/cmdline/SConscript
@@ -1,6 +1,6 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 Import('basic param')
 popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param])
 Export('popt_common')
diff --git a/source4/lib/com/SConscript b/source4/lib/com/SConscript
new file mode 100644
index 0000000000..44708bdf32
--- /dev/null
+++ b/source4/lib/com/SConscript
@@ -0,0 +1,4 @@
+Import('hostenv')
+hostenv.StaticLibrary('com', [ 'tables.c','rot.c','main.c'])
+hostenv.StaticLibrary('dcom', [ 'dcom/tables.c','dcom/main.c'])
+hostenv.StaticLibrary('com_simple', ['classes/simple.c'])
diff --git a/source4/lib/events/SConscript b/source4/lib/events/SConscript
new file mode 100644
index 0000000000..e1ca866233
--- /dev/null
+++ b/source4/lib/events/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('events',['events.c','events_standard.c'])
diff --git a/source4/lib/messaging/SConscript b/source4/lib/messaging/SConscript
index 4c62ffb82e..1d1ee5859b 100644
--- a/source4/lib/messaging/SConscript
+++ b/source4/lib/messaging/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('messaging','messaging.c')
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index fd13edc42f..78496e7e1a 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -1,8 +1,7 @@
-#            tastes like -*- python -*-
-
 Import('hostenv')
+#            tastes like -*- python -*-
 
-conf = Configure(hostenv)
+conf = hostenv.Configure()
 conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);')
 conf.Finish()
 
diff --git a/source4/lib/registry/SConscript b/source4/lib/registry/SConscript
index 4ea4301105..65aeb5b17a 100644
--- a/source4/lib/registry/SConscript
+++ b/source4/lib/registry/SConscript
@@ -1,6 +1,6 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 Import('talloc basic popt_common popt param')
 registry = hostenv.StaticLibrary('registry',
 			[basic,talloc,'common/reg_interface.c','common/reg_util.c'])
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
index f8efcc55b9..b63b544f8a 100644
--- a/source4/lib/replace/SConscript
+++ b/source4/lib/replace/SConscript
@@ -1,6 +1,6 @@
 Import('hostenv')
-
 conf = Configure(hostenv)
+
 #FIXME: conf.CheckBrokenInetNtoa() 
 for f in ['strtoull','__strtoull','strtouq','strtoll','__strtoll','strtoq',
 		  'seteuid','setresuid','setegid','setresgid']:
diff --git a/source4/lib/samba3/SConscript b/source4/lib/samba3/SConscript
index 7fc6e7ce37..ba1f76b1a7 100644
--- a/source4/lib/samba3/SConscript
+++ b/source4/lib/samba3/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('samba3',
 		['smbpasswd.c','tdbsam.c','policy.c','idmap.c','winsdb.c','samba3.c',
 		'group.c','registry.c','secrets.c','share_info.c'])
diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript
index 4d81cd5696..db449592c2 100644
--- a/source4/lib/socket/SConscript
+++ b/source4/lib/socket/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('socket_ipv4.c')
 hostenv.StaticLibrary('socket_ipv6.c')
 hostenv.StaticLibrary('socket_unix.c')
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index fe5844d6da..6ec9c338d3 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c'])
diff --git a/source4/lib/talloc/SConscript b/source4/lib/talloc/SConscript
index 37079c4156..ad88262f1d 100644
--- a/source4/lib/talloc/SConscript
+++ b/source4/lib/talloc/SConscript
@@ -1,5 +1,5 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 talloc = hostenv.StaticLibrary('talloc',['talloc.c'])
 Export('talloc')
diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript
index 88f150b9cf..6abcdff821 100644
--- a/source4/lib/tls/SConscript
+++ b/source4/lib/tls/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('tls', ['tls.c', 'tlscert.c'])