Replace SENFSCons.InstallIncludeFiles with InstallSubdir builder calls

[senf.git] / Utils / SConscript

diff --git a/Utils/SConscript b/Utils/SConscript
index 75a2b96..ef0872c 100644 (file)
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -1,28 +1,15 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons, glob
+import SENFSCons, glob, os.path
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
+sources, includes = SENFSCons.Glob(env, subdirs=[ 'impl' ])
 
-# OUCH ... another hack to work around a scons bug ...
-Execute(Touch("Logger/all_includes.hh"))
-
-sources, testSources = SENFSCons.GlobSources()
-objects = SENFSCons.Objects( env, sources = sources, testSources=testSources )
-
-for sc in glob.glob("*/SConscript"):
-    ob = SConscript(sc)
-    if ob : objects.extend(ob)
-
-lib = SENFSCons.Lib(env,
-                    library = 'Utils',
-                    sources = objects,
-                    no_includes = True)
+SENFSCons.Lib(env, sources)
+SENFSCons.Doxygen(env)
 
-SENFSCons.InstallSourceIncludes(env, Flatten([ lib, '.test.bin', 'Logger/.test.bin' ]))
+env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = includes)
 
-SENFSCons.Doxygen(env)
-SENFSCons.InstallIncludeFiles(env, [ 'Logger.hh', 'Daemon.hh' ])
+SConscript(glob.glob("*/SConscript"))