Completely refactor install targets

[senf.git] / Utils / SConscript

diff --git a/Utils/SConscript b/Utils/SConscript
index d17af8a..e07dec0 100644 (file)
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -5,20 +5,11 @@ import SENFSCons, glob, os.path
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
-
-# OUCH ... another hack to work around a scons bug ...
-if not os.path.exists("Logger/all_includes.hh"):
-    Execute(Touch("Logger/all_includes.hh"))
-
-sources, testSources = SENFSCons.GlobSources()
-objects = SENFSCons.Objects( env, sources = sources, testSources=testSources )
-
-lib = SENFSCons.Lib(env,
-                    library = 'Utils',
-                    sources = objects)
+sources, includes = SENFSCons.Glob(env, subdirs=[ 'impl' ])
 
+SENFSCons.StandardTargets(env)
+SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
-SENFSCons.InstallIncludeFiles(env, [ 'Logger.hh', 'Daemon.hh' ])
+SENFSCons.InstallIncludeFiles(env, includes)
 
 SConscript(glob.glob("*/SConscript"))