Fix example build

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1335 270642c3-0616-0410-b53a-bc976706d245

diff --git a/Examples/MCSniffer/SConscript b/Examples/MCSniffer/SConscript
index b74eaf0..1b89af3 100644 (file)
--- a/Examples/MCSniffer/SConscript
+++ b/Examples/MCSniffer/SConscript
@@ -7,4 +7,4 @@ import SENFSCons
 
 sources, tests, includes = SENFSCons.Glob(env)
 
-env.Program('mcsniffer', sources + [ '${LOCALLIBDIR}/AllBundles.o' ])
+env.Alias('examples', env.Program('mcsniffer', sources + [ '${LOCALLIBDIR}/AllBundles.o' ]))

diff --git a/Examples/MultiMCLoop/SConscript b/Examples/MultiMCLoop/SConscript
index 6f959f7..7d5d5a6 100644 (file)
--- a/Examples/MultiMCLoop/SConscript
+++ b/Examples/MultiMCLoop/SConscript
@@ -1,6 +1,8 @@
+# -*- python -*-
+
 Import('env')
 import SENFSCons
 
 ###########################################################################
 
-env.Program('multimcloop', [ 'MultiMCLoop.cc' ])
+env.Alias('examples', env.Program('multimcloop', [ 'MultiMCLoop.cc' ]))

diff --git a/Examples/RateStuffer/SConscript b/Examples/RateStuffer/SConscript
index f6da6b3..dff9ebf 100644 (file)
--- a/Examples/RateStuffer/SConscript
+++ b/Examples/RateStuffer/SConscript
@@ -1,3 +1,5 @@
+# -*- python -*-
+
 Import('env')
 import SENFSCons
 
@@ -5,7 +7,7 @@ import SENFSCons
 
 sources, tests, includes = SENFSCons.Glob(env)
 
-env.Program('ratestuffer', sources)
+env.Alias('examples', env.Program('ratestuffer', sources))
 
 SENFSCons.Doxygen(env, extra_sources=[
     env.Dia2Png('ratestuffer.dia')

diff --git a/Examples/Sniffer/SConscript b/Examples/Sniffer/SConscript
index f894589..458ed89 100644 (file)
--- a/Examples/Sniffer/SConscript
+++ b/Examples/Sniffer/SConscript
@@ -7,5 +7,5 @@ import SENFSCons
 
 sources, tests, includes = SENFSCons.Glob(env)
 
-env.Program('sniffer', sources + [ '${LOCALLIBDIR}/AllBundles.o' ])
+env.Alias('examples', env.Program('sniffer', sources + [ '${LOCALLIBDIR}/AllBundles.o' ]))
 SENFSCons.Doxygen(env)

diff --git a/Examples/TCPClientServer/SConscript b/Examples/TCPClientServer/SConscript
index 78d4eca..5214d4d 100644 (file)
--- a/Examples/TCPClientServer/SConscript
+++ b/Examples/TCPClientServer/SConscript
@@ -3,5 +3,5 @@ import SENFSCons
 
 ###########################################################################
 
-env.Program('client', 'client.cc')
-env.Program('server', 'server.cc')
+env.Alias('examples', env.Program('client', 'client.cc'))
+env.Alias('examples', env.Program('server', 'server.cc'))

diff --git a/Examples/UDPClientServer/SConscript b/Examples/UDPClientServer/SConscript
index fd749bf..039d14a 100644 (file)
--- a/Examples/UDPClientServer/SConscript
+++ b/Examples/UDPClientServer/SConscript
@@ -3,7 +3,7 @@ import SENFSCons
 
 ###########################################################################
 
-env.Program('udpClient', 'udpClient.cc')
-env.Program('udpServer', 'udpServer.cc')
+env.Alias('examples', env.Program('udpClient', 'udpClient.cc'))
+env.Alias('examples', env.Program('udpServer', 'udpServer.cc'))
 
 SENFSCons.Doxygen(env)

diff --git a/SConstruct b/SConstruct
index 18a3397..5ab04af 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -143,7 +143,7 @@ env.Install('$LIBINSTALLDIR', libsenf)
 env.Alias('install_all', env.FindInstalledFiles())
 env.Alias('default', DEFAULT_TARGETS)
 env.Alias('all_tests', env.FindAllBoostUnitTests())
-env.Alias('all', [ 'default', 'all_tests', 'all_docs' ])
+env.Alias('all', [ 'default', 'all_tests', 'examples', 'all_docs' ])
 
 #### prepare
 env.PhonyTarget('prepare', [], [])

diff --git a/debian/SConscript b/debian/SConscript
index 769a700..ef2cc74 100644 (file)
--- a/debian/SConscript
+++ b/debian/SConscript
@@ -111,3 +111,4 @@ env.PhonyTarget('debbin', [], [
     "fakeroot ./debian/rules debclean"
 ])
 
+env.Clean(env.Alias('all'), 'changelog')

diff --git a/senf/Packets/SConscript b/senf/Packets/SConscript
index 25d5c94..59ff51b 100644 (file)
--- a/senf/Packets/SConscript
+++ b/senf/Packets/SConscript
@@ -54,5 +54,5 @@ SENFSCons.AutoRules(env, doc_extra_sources = [
     env.PkgDraw("MPEGDVBBundle/SNDUPacket.hh"),
     env.PkgDraw("MPEGDVBBundle/TransportPacket.hh"),
 ])
-env.Default(env.CombinedObject('${LOCALLIBDIR}/${NAME}', env['PACKET_BUNDLES'],
+env.Default(env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', env['PACKET_BUNDLES'],
                                NAME="AllBundles"))