X-Git-Url: http://g0dil.de/git?p=senf.git;a=blobdiff_plain;f=SConscript;h=9542fa95234eef71980566bf8aaf273b9cfe9cbd;hp=fbe69539599081f71491fffcf3268b9a96df8950;hb=HEAD;hpb=737789818bf8658d3b3f4444a273b2d44021e51a

diff --git a/SConscript b/SConscript
index fbe6953..9542fa9 100644
--- a/SConscript
+++ b/SConscript
@@ -1,6 +1,9 @@
+# -*- python -*-
+
 Import('env')
 
-env['ALLOBJECTS'] = []
+env.Replace( ALLOBJECTS = [], PACKET_BUNDLES = [] )
+env.SetDefault( ALLBUNDLES = '$LOCALLIBDIR/AllBundles${OBJADDSUFFIX}${OBJSUFFIX}' )
 
 SConscript('senf/SConscript')
 
@@ -9,7 +12,16 @@ libsenf = env.Library("$LOCALLIBDIR/${LIBSENF}${LIBADDSUFFIX}", env['ALLOBJECTS'
 env.Default(libsenf)
 env.Install('$LIBINSTALLDIR', libsenf)
 
-conf = env.CreateFile("${LOCALLIBDIR}/${LIBSENF}${LIBADDSUFFIX}.conf", 
-                      env.Value(env.subst("$_CPPDEFFLAGS")))
+env.SetDefault(
+    _BOOST_EXT_INC_OPT = "${NEED_BOOST_EXT and '-I$$SENFINCDIR/boost_ext' or ''}")
+
+conf = env.CreateFile("${LOCALLIBDIR}/${LIBSENF}${LIBADDSUFFIX}.conf",
+                      env.Value(env.subst('$_BOOST_EXT_INC_OPT $_CPPDEFFLAGS')))
 env.Default(conf)
 env.Install('$CONFINSTALLDIR', conf)
+
+### AllBundles:
+cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', env['PACKET_BUNDLES'],
+                              NAME="AllBundles")
+env.Default(cobject)
+env.Install('${OBJINSTALLDIR}', cobject)