Move include files in debian packge into 'senf' subdirectory

diff --git a/Examples/DVBAdapter/MPEdec.cc b/Examples/DVBAdapter/MPEdec.cc

index 107fd64..50ecf3c 100644 (file)
--- a/Examples/DVBAdapter/MPEdec.cc
+++ b/Examples/DVBAdapter/MPEdec.cc
@@ -29,15 +29,15 @@
 #include <linux/sockios.h>
 #include <linux/dvb/dmx.h> 
 
-#include "Scheduler/Scheduler.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Packets/MPEGDVBBundle/DatagramSection.hh"
-#include "Utils/membind.hh"
-#include "Utils/hexdump.hh"
-#include "Socket/Protocols/DVB/DVBDemuxHandles.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/Packet.hh"
-#include "Packets/PacketData.hh"
+#include "../../Scheduler/Scheduler.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Packets/MPEGDVBBundle/DatagramSection.hh"
+#include "../../Utils/membind.hh"
+#include "../../Utils/hexdump.hh"
+#include "../../Socket/Protocols/DVB/DVBDemuxHandles.hh"
+#include "../../Packets/ParseInt.hh"
+#include "../../Packets/Packet.hh"
+#include "../../Packets/PacketData.hh"
 
 #define PID 500
 
diff --git a/Examples/DVBAdapter/ULEdec.cc b/Examples/DVBAdapter/ULEdec.cc

index c00e607..64e79a7 100644 (file)
--- a/Examples/DVBAdapter/ULEdec.cc
+++ b/Examples/DVBAdapter/ULEdec.cc
@@ -26,9 +26,9 @@
 
 #include <linux/dvb/dmx.h> 
 #include <boost/format.hpp>
-#include "Packets/PacketData.hh"
-#include "Utils/hexdump.hh"
-#include "Utils/membind.hh"
+#include "../../Packets/PacketData.hh"
+#include "../../Utils/hexdump.hh"
+#include "../../Utils/membind.hh"
 
 #define PID 271
 #define TRANSPORT_PACKET_SIZE 188
diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh

index df61af8..1cb705f 100644 (file)
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -22,10 +22,10 @@
 
 // Definition of non-inline non-template functions
 
-#include "Scheduler/Scheduler.hh"
-#include "Packets/MPEGDVBBundle/TransportPacket.hh"
-#include "Packets/MPEGDVBBundle/SNDUPacket.hh"
-#include "Socket/Protocols/DVB/DVBDemuxHandles.hh"
+#include "../../Scheduler/Scheduler.hh"
+#include "../../Packets/MPEGDVBBundle/TransportPacket.hh"
+#include "../../Packets/MPEGDVBBundle/SNDUPacket.hh"
+#include "../../Socket/Protocols/DVB/DVBDemuxHandles.hh"
 
 
 class ULEdec
diff --git a/Examples/DVBAdapter/frontend.cc b/Examples/DVBAdapter/frontend.cc

index 300a7fb..6e3afb2 100644 (file)
--- a/Examples/DVBAdapter/frontend.cc
+++ b/Examples/DVBAdapter/frontend.cc
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <iostream>
-#include "Socket/Protocols/DVB/DVBFrontendHandle.hh"
+#include "../../Socket/Protocols/DVB/DVBFrontendHandle.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc

index 71913ac..c6c32a3 100644 (file)
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -29,11 +29,11 @@
 #include <fstream>
 #include <string>
 #include <iomanip>
-#include "Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Utils/membind.hh"
-#include "Utils/hexdump.hh"
+#include "../../Socket/Protocols/INet/UDPSocketHandle.hh"
+#include "../../Scheduler/Scheduler.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Utils/membind.hh"
+#include "../../Utils/hexdump.hh"
 
 
 //#include "MCSniffer.mpp"
diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc

index 7969d59..5217801 100644 (file)
--- a/Examples/RateStuffer/ratestuffer.cc
+++ b/Examples/RateStuffer/ratestuffer.cc
@@ -27,19 +27,19 @@
 //#include "ppitest.ih"
 
 // Custom includes
-#include "Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
-#include "PPI/SocketReader.hh"
-#include "PPI/SocketWriter.hh"
-#include "PPI/Module.hh"
-#include "PPI/IntervalTimer.hh"
-#include "PPI/Joins.hh"
-#include "PPI/ThrottleBarrier.hh"
-#include "PPI/PassiveQueue.hh"
-#include "PPI/Queueing.hh"
-#include "PPI/CloneSource.hh"
-#include "PPI/Setup.hh"
+#include "../../Socket/Protocols/INet/UDPSocketHandle.hh"
+#include "../../Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
+#include "../../PPI/SocketReader.hh"
+#include "../../PPI/SocketWriter.hh"
+#include "../../PPI/Module.hh"
+#include "../../PPI/IntervalTimer.hh"
+#include "../../PPI/Joins.hh"
+#include "../../PPI/ThrottleBarrier.hh"
+#include "../../PPI/PassiveQueue.hh"
+#include "../../PPI/Queueing.hh"
+#include "../../PPI/CloneSource.hh"
+#include "../../PPI/Setup.hh"
 
 //#include "ppitest.mpp"
 #define prefix_
diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc

index 450b789..1d60837 100644 (file)
--- a/Examples/Sniffer/Sniffer.cc
+++ b/Examples/Sniffer/Sniffer.cc
@@ -29,11 +29,11 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
-#include "Socket/Protocols/Raw/PacketSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Utils/hexdump.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Socket/Protocols/Raw/PacketSocketHandle.hh"
+#include "../../Scheduler/Scheduler.hh"
+#include "../../Utils/membind.hh"
+#include "../../Utils/hexdump.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
 
 //#include "Sniffer.mpp"
 #define prefix_
diff --git a/Examples/TCPClientServer/client.cc b/Examples/TCPClientServer/client.cc

index 219c91a..83fbde6 100644 (file)
--- a/Examples/TCPClientServer/client.cc
+++ b/Examples/TCPClientServer/client.cc
@@ -24,8 +24,8 @@
 // Custom includes
 #include <iostream>
 #include <sstream>
-#include "Socket/Protocols/INet/TCPSocketHandle.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
+#include "../../Socket/Protocols/INet/TCPSocketHandle.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 int main(int argc, char const * argv[])
 {
diff --git a/Examples/TCPClientServer/server.cc b/Examples/TCPClientServer/server.cc

index 376c8dd..ef9f7ef 100644 (file)
--- a/Examples/TCPClientServer/server.cc
+++ b/Examples/TCPClientServer/server.cc
@@ -28,10 +28,10 @@
 // Custom includes
 #include <string>
 #include <iostream>
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Socket/Protocols/INet/TCPSocketHandle.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
+#include "../../Scheduler/Scheduler.hh"
+#include "../../Utils/membind.hh"
+#include "../../Socket/Protocols/INet/TCPSocketHandle.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 
 class Server
diff --git a/PPI/CloneSource.hh b/PPI/CloneSource.hh

index 1c5535e..1ca4e4e 100644 (file)
--- a/PPI/CloneSource.hh
+++ b/PPI/CloneSource.hh
@@ -27,7 +27,7 @@
 #define HH_CloneSource_ 1
 
 // Custom includes
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 #include "Module.hh"
 #include "Connectors.hh"
 
diff --git a/PPI/CloneSource.test.cc b/PPI/CloneSource.test.cc

index 97c6ecd..544461e 100644 (file)
--- a/PPI/CloneSource.test.cc
+++ b/PPI/CloneSource.test.cc
@@ -30,7 +30,7 @@
 #include "CloneSource.hh"
 #include "DebugModules.hh"
 #include "Setup.hh"
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/PPI/Connectors.hh b/PPI/Connectors.hh

index fbaafb6..fe6d5f7 100644 (file)
--- a/PPI/Connectors.hh
+++ b/PPI/Connectors.hh
@@ -28,8 +28,8 @@
 #include <deque>
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include "Utils/SafeBool.hh"
-#include "Packets/Packets.hh"
+#include "../Utils/SafeBool.hh"
+#include "../Packets/Packets.hh"
 #include "predecl.hh"
 #include "detail/Callback.hh"
 #include "Queueing.hh"
diff --git a/PPI/DebugModules.cti b/PPI/DebugModules.cti

index 7e65003..c4c20fc 100644 (file)
--- a/PPI/DebugModules.cti
+++ b/PPI/DebugModules.cti
@@ -26,7 +26,7 @@
 //#include "DebugModules.ih"
 
 // Custom includes
-#include "Utils/hexdump.hh"
+#include "../Utils/hexdump.hh"
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
diff --git a/PPI/DebugModules.hh b/PPI/DebugModules.hh

index 7377ea5..bfa0979 100644 (file)
--- a/PPI/DebugModules.hh
+++ b/PPI/DebugModules.hh
@@ -28,11 +28,11 @@
 
 // Custom includes
 #include <deque>
-#include "Utils/SafeBool.hh"
-#include "Packets/Packets.hh"
+#include "../Utils/SafeBool.hh"
+#include "../Packets/Packets.hh"
 #include "Module.hh"
 #include "ActiveFeeder.hh"
-#include "Utils/Logger.hh"
+#include "../Utils/Logger.hh"
 
 //#include "DebugModules.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/PPI/DebugModules.test.cc b/PPI/DebugModules.test.cc

index 60cb8e8..a228c83 100644 (file)
--- a/PPI/DebugModules.test.cc
+++ b/PPI/DebugModules.test.cc
@@ -36,7 +36,7 @@ namespace {
     std::stringstream logstream;
 }
 
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 #include "DebugModules.hh"
 #include "Setup.hh"
 
diff --git a/PPI/EventManager.cci b/PPI/EventManager.cci

index f75fa38..f9707f8 100644 (file)
--- a/PPI/EventManager.cci
+++ b/PPI/EventManager.cci
@@ -26,7 +26,7 @@
 //#include "EventManager.ih"
 
 // Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
diff --git a/PPI/EventManager.hh b/PPI/EventManager.hh

index 482d17b..c56a893 100644 (file)
--- a/PPI/EventManager.hh
+++ b/PPI/EventManager.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/ptr_container/ptr_vector.hpp>
-#include "Scheduler/ClockService.hh"
+#include "../Scheduler/ClockService.hh"
 #include "predecl.hh"
 #include "detail/Callback.hh"
 #include "detail/EventBinding.hh"
diff --git a/PPI/Events.hh b/PPI/Events.hh

index e05fb5c..feae76f 100644 (file)
--- a/PPI/Events.hh
+++ b/PPI/Events.hh
@@ -26,7 +26,7 @@
 
 // Custom includes
 #include <vector>
-#include "Scheduler/ClockService.hh"
+#include "../Scheduler/ClockService.hh"
 #include "predecl.hh"
 
 //#include "Events.mpp"
diff --git a/PPI/IOEvent.hh b/PPI/IOEvent.hh

index 8e18532..f4b2e77 100644 (file)
--- a/PPI/IOEvent.hh
+++ b/PPI/IOEvent.hh
@@ -27,7 +27,7 @@
 #define HH_IOEvent_ 1
 
 // Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
 #include "Events.hh"
 
 //#include "IOEvent.mpp"
diff --git a/PPI/IdleEvent.cc b/PPI/IdleEvent.cc

index fcbe357..b8a73c8 100644 (file)
--- a/PPI/IdleEvent.cc
+++ b/PPI/IdleEvent.cc
@@ -27,7 +27,7 @@
 //#include "IdleEvent.ih"
 
 // Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
 
 //#include "IdleEvent.mpp"
 #define prefix_
diff --git a/PPI/IntervalTimer.cc b/PPI/IntervalTimer.cc

index 287d88a..62b2fa6 100644 (file)
--- a/PPI/IntervalTimer.cc
+++ b/PPI/IntervalTimer.cc
@@ -27,7 +27,7 @@
 //#include "IntervalTimer.ih"
 
 // Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
 #include "EventManager.hh"
 
 //#include "IntervalTimer.mpp"
diff --git a/PPI/IntervalTimer.hh b/PPI/IntervalTimer.hh

index 5fe2aab..8cb7f5b 100644 (file)
--- a/PPI/IntervalTimer.hh
+++ b/PPI/IntervalTimer.hh
@@ -27,7 +27,7 @@
 #define HH_IntervalTimer_ 1
 
 // Custom includes
-#include "Scheduler/ClockService.hh"
+#include "../Scheduler/ClockService.hh"
 #include "Events.hh"
 
 //#include "IntervalTimer.mpp"
diff --git a/PPI/Joins.test.cc b/PPI/Joins.test.cc

index 7f07983..fbe9e05 100644 (file)
--- a/PPI/Joins.test.cc
+++ b/PPI/Joins.test.cc
@@ -30,7 +30,7 @@
 #include "Joins.hh"
 #include "DebugModules.hh"
 #include "Setup.hh"
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/PPI/Module.hh b/PPI/Module.hh

index 7e6e21e..16e3505 100644 (file)
--- a/PPI/Module.hh
+++ b/PPI/Module.hh
@@ -29,7 +29,7 @@
 #include <vector>
 #include <boost/utility.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
-#include "Scheduler/ClockService.hh"
+#include "../Scheduler/ClockService.hh"
 #include "predecl.hh"
 
 //#include "Module.mpp"
diff --git a/PPI/ModuleManager.cc b/PPI/ModuleManager.cc

index 25c771e..7093e6e 100644 (file)
--- a/PPI/ModuleManager.cc
+++ b/PPI/ModuleManager.cc
@@ -27,7 +27,7 @@
 //#include "ModuleManager.ih"
 
 // Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
 #include "Module.hh"
 
 //#include "ModuleManager.mpp"
diff --git a/PPI/PPI.hh b/PPI/PPI.hh

new file mode 100644 (file)

index 0000000..480967d
--- /dev/null
+++ b/PPI/PPI.hh
@@ -0,0 +1,42 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief PPI public header */
+
+#ifndef HH_PPI_
+#define HH_PPI_ 1
+
+#include "all_includes.hh"
+
+#endif
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/PPI/PassiveQueue.test.cc b/PPI/PassiveQueue.test.cc

index c77465e..d1b2550 100644 (file)
--- a/PPI/PassiveQueue.test.cc
+++ b/PPI/PassiveQueue.test.cc
@@ -30,7 +30,7 @@
 #include "PassiveQueue.hh"
 #include "DebugModules.hh"
 #include "Setup.hh"
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/PPI/Queueing.test.cc b/PPI/Queueing.test.cc

index ce7b17c..7e05f4e 100644 (file)
--- a/PPI/Queueing.test.cc
+++ b/PPI/Queueing.test.cc
@@ -31,7 +31,7 @@
 #include "Module.hh"
 #include "Connectors.hh"
 #include "DebugModules.hh"
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 #include "Setup.hh"
 
 #include <boost/test/auto_unit_test.hpp>
diff --git a/PPI/SConscript b/PPI/SConscript

index cfc0e69..6f021ce 100644 (file)
--- a/PPI/SConscript
+++ b/PPI/SConscript
@@ -3,6 +3,9 @@ import SENFSCons, glob
 
 ###########################################################################
 
+SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
+                               if f not in ('all_includes.hh','PPI.hh') and not f.endswith('.test.hh') ])
+
 SConscript(glob.glob("*/SConscript"))
 
 sources = SENFSCons.GlobSources(subdirs=[ 'detail' ])
@@ -19,3 +22,5 @@ SENFSCons.Doxygen(env, extra_sources=[
     env.Dia2Png('classes.dia'),
     env.Dia2Png('ratestuffer.dia'),
 ])
+
+SENFSCons.InstallIncludeFiles(env, [ 'PPI.hh', 'all_includes.hh' ])
diff --git a/PPI/SocketReader.hh b/PPI/SocketReader.hh

index 4d67951..c850603 100644 (file)
--- a/PPI/SocketReader.hh
+++ b/PPI/SocketReader.hh
@@ -25,11 +25,11 @@
 #define HH_SocketReader_ 1
 
 // Custom includes
-#include "Packets/Packets.hh"
-#include "Socket/ClientSocketHandle.hh"
-#include "Socket/SocketPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/FramingPolicy.hh"
+#include "../Packets/Packets.hh"
+#include "../Socket/ClientSocketHandle.hh"
+#include "../Socket/SocketPolicy.hh"
+#include "../Socket/ReadWritePolicy.hh"
+#include "../Socket/FramingPolicy.hh"
 #include "Module.hh"
 #include "Connectors.hh"
 #include "IOEvent.hh"
diff --git a/PPI/SocketReader.test.cc b/PPI/SocketReader.test.cc

index 6c6f3b4..dcd410d 100644 (file)
--- a/PPI/SocketReader.test.cc
+++ b/PPI/SocketReader.test.cc
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <algorithm>
-#include "Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
+#include "../Socket/Protocols/INet/UDPSocketHandle.hh"
+#include "../Scheduler/Scheduler.hh"
 #include "SocketReader.hh"
 #include "DebugModules.hh"
 #include "Setup.hh"
diff --git a/PPI/SocketWriter.hh b/PPI/SocketWriter.hh

index 547c105..dccb218 100644 (file)
--- a/PPI/SocketWriter.hh
+++ b/PPI/SocketWriter.hh
@@ -25,12 +25,12 @@
 #define HH_SocketWriter_ 1
 
 // Custom includes
-#include "Packets/Packets.hh"
-#include "Socket/ClientSocketHandle.hh"
-#include "Socket/SocketPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
+#include "../Packets/Packets.hh"
+#include "../Socket/ClientSocketHandle.hh"
+#include "../Socket/SocketPolicy.hh"
+#include "../Socket/ReadWritePolicy.hh"
+#include "../Socket/FramingPolicy.hh"
+#include "../Socket/CommunicationPolicy.hh"
 #include "Module.hh"
 #include "Connectors.hh"
 
diff --git a/PPI/SocketWriter.test.cc b/PPI/SocketWriter.test.cc

index 83985ca..09a2450 100644 (file)
--- a/PPI/SocketWriter.test.cc
+++ b/PPI/SocketWriter.test.cc
@@ -27,8 +27,8 @@
 //#include "SocketWriter.test.ih"
 
 // Custom includes
-#include "Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
+#include "../Socket/Protocols/INet/UDPSocketHandle.hh"
+#include "../Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
 #include "SocketReader.hh"
 #include "DebugModules.hh"
 #include "SocketWriter.hh"
diff --git a/PPI/ThrottleBarrier.test.cc b/PPI/ThrottleBarrier.test.cc

index 223663b..75ac4c3 100644 (file)
--- a/PPI/ThrottleBarrier.test.cc
+++ b/PPI/ThrottleBarrier.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "ThrottleBarrier.hh"
 #include "DebugModules.hh"
-#include "Packets/Packets.hh"
+#include "../Packets/Packets.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/PPI/detail/EventBinding.hh b/PPI/detail/EventBinding.hh

index 05ade30..400d5e4 100644 (file)
--- a/PPI/detail/EventBinding.hh
+++ b/PPI/detail/EventBinding.hh
@@ -27,7 +27,7 @@
 #define HH_EventBinding_ 1
 
 // Custom includes
-#include "Scheduler/ClockService.hh"
+#include "../../Scheduler/ClockService.hh"
 #include "../predecl.hh"
 #include "Callback.hh"
 
diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh

index 9615565..18f37a9 100644 (file)
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <algorithm>
-#include "Socket/Protocols/Raw/MACAddress.hh"
-#include "Packets/Packets.hh"
+#include "../../Socket/Protocols/Raw/MACAddress.hh"
+#include "../../Packets/Packets.hh"
 
 //#include "EthernetPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/DefaultBundle/IpV4Packet.hh b/Packets/DefaultBundle/IpV4Packet.hh

index 0dd8344..5fc143e 100644 (file)
--- a/Packets/DefaultBundle/IpV4Packet.hh
+++ b/Packets/DefaultBundle/IpV4Packet.hh
@@ -27,8 +27,8 @@
 #define HH_IpV4Packet_ 1
 
 // Custom includes
-#include "Socket/Protocols/INet/INet4Address.hh"
-#include "Packets/Packets.hh"
+#include "../../Socket/Protocols/INet/INet4Address.hh"
+#include "../../Packets/Packets.hh"
 
 //#include "IpV4Packet.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/DefaultBundle/IpV6Extensions.test.cc b/Packets/DefaultBundle/IpV6Extensions.test.cc

index aa5bf45..bf79564 100644 (file)
--- a/Packets/DefaultBundle/IpV6Extensions.test.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.test.cc
@@ -28,7 +28,7 @@
 #include "IpV6Extensions.hh"
 #include "IpV6Packet.hh"
 #include "UDPPacket.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/Packets/DefaultBundle/IpV6Packet.cc b/Packets/DefaultBundle/IpV6Packet.cc

index dfb1aea..2cf67b2 100644 (file)
--- a/Packets/DefaultBundle/IpV6Packet.cc
+++ b/Packets/DefaultBundle/IpV6Packet.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include <boost/io/ios_state.hpp>
 #include "EthernetPacket.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 //#include "IpV6Packet.mpp"
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV6Packet.hh b/Packets/DefaultBundle/IpV6Packet.hh

index b93a81b..f64652d 100644 (file)
--- a/Packets/DefaultBundle/IpV6Packet.hh
+++ b/Packets/DefaultBundle/IpV6Packet.hh
@@ -25,8 +25,8 @@
 #define HH_IpV6Packet_ 1
 
 // Custom includes
-#include "Socket/Protocols/INet/INet6Address.hh"
-#include "Packets/Packets.hh"
+#include "../../Socket/Protocols/INet/INet6Address.hh"
+#include "../../Packets/Packets.hh"
 #include "IpV4Packet.hh"
 
 //#include "IpV6Packet.mpp"
diff --git a/Packets/DefaultBundle/IpV6Packet.test.cc b/Packets/DefaultBundle/IpV6Packet.test.cc

index c3bf90b..57c8dc4 100644 (file)
--- a/Packets/DefaultBundle/IpV6Packet.test.cc
+++ b/Packets/DefaultBundle/IpV6Packet.test.cc
@@ -26,8 +26,8 @@
 
 // Custom includes
 #include "IpV6Packet.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
-#include "Packets/DataPacket.hh"
+#include "../../Socket/Protocols/INet/INetAddressing.hh"
+#include "../../Packets/DataPacket.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/Packets/DefaultBundle/UDPPacket.cc b/Packets/DefaultBundle/UDPPacket.cc

index 6f30ea4..5cf1f43 100644 (file)
--- a/Packets/DefaultBundle/UDPPacket.cc
+++ b/Packets/DefaultBundle/UDPPacket.cc
@@ -28,7 +28,7 @@
 #include "IpV4Packet.hh"
 
 // Custom includes
-#include "Packets/Packets.hh"
+#include "../../Packets/Packets.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
diff --git a/Packets/DefaultBundle/UDPPacket.hh b/Packets/DefaultBundle/UDPPacket.hh

index 560c360..e42bbc4 100644 (file)
--- a/Packets/DefaultBundle/UDPPacket.hh
+++ b/Packets/DefaultBundle/UDPPacket.hh
@@ -27,7 +27,7 @@
 #define HH_UDPPacket_ 1
 
 // Custom includes
-#include "Packets/Packets.hh"
+#include "../../Packets/Packets.hh"
 
 //#include "UDPPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/MPEGDVBBundle/DSMCCSection.hh b/Packets/MPEGDVBBundle/DSMCCSection.hh

index b0eccc1..1f47945 100644 (file)
--- a/Packets/MPEGDVBBundle/DSMCCSection.hh
+++ b/Packets/MPEGDVBBundle/DSMCCSection.hh
@@ -28,9 +28,9 @@
 
 // Custom includes
 #include <algorithm>
-#include "Packets/PacketType.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/PacketParser.hh"
+#include "../../Packets/PacketType.hh"
+#include "../../Packets/ParseInt.hh"
+#include "../../Packets/PacketParser.hh"
 
 //#include "DSMCCSection.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/MPEGDVBBundle/DatagramSection.hh b/Packets/MPEGDVBBundle/DatagramSection.hh

index 3e4e355..b0e9331 100644 (file)
--- a/Packets/MPEGDVBBundle/DatagramSection.hh
+++ b/Packets/MPEGDVBBundle/DatagramSection.hh
@@ -28,11 +28,11 @@
 
 // Custom includes
 #include <algorithm>
-#include "Packets/PacketType.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/PacketRegistry.hh"
-#include "Packets/PacketParser.hh"
-#include "Packets/MPEGDVBBundle/DSMCCSection.hh"
+#include "../../Packets/PacketType.hh"
+#include "../../Packets/ParseInt.hh"
+#include "../../Packets/PacketRegistry.hh"
+#include "../../Packets/PacketParser.hh"
+#include "../../Packets/MPEGDVBBundle/DSMCCSection.hh"
 
 
 //#include "DatagramSection.mpp"
diff --git a/Packets/MPEGDVBBundle/SNDUPacket.cc b/Packets/MPEGDVBBundle/SNDUPacket.cc

index 582a2d4..abf9783 100644 (file)
--- a/Packets/MPEGDVBBundle/SNDUPacket.cc
+++ b/Packets/MPEGDVBBundle/SNDUPacket.cc
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <iomanip>
-#include "Utils/hexdump.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Utils/hexdump.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
 
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/SNDUPacket.hh b/Packets/MPEGDVBBundle/SNDUPacket.hh

index 5409272..3645b57 100644 (file)
--- a/Packets/MPEGDVBBundle/SNDUPacket.hh
+++ b/Packets/MPEGDVBBundle/SNDUPacket.hh
@@ -29,11 +29,11 @@
 // Custom includes
 #include <algorithm>
 #include <boost/crc.hpp>
-#include "Packets/PacketType.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/PacketRegistry.hh"
-#include "Packets/PacketParser.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Packets/PacketType.hh"
+#include "../../Packets/ParseInt.hh"
+#include "../../Packets/PacketRegistry.hh"
+#include "../../Packets/PacketParser.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
 
 //#include "SNDUPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh

index 323ff78..94248c9 100644 (file)
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -28,10 +28,10 @@
 
 // Custom includes
 #include <algorithm>
-#include "Packets/PacketType.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/PacketRegistry.hh"
-#include "Packets/PacketParser.hh"
+#include "../../Packets/PacketType.hh"
+#include "../../Packets/ParseInt.hh"
+#include "../../Packets/PacketRegistry.hh"
+#include "../../Packets/PacketParser.hh"
 
 //#include "TransportPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/Packet.hh b/Packets/Packet.hh

index d04c6ae..8f8dad5 100644 (file)
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -27,8 +27,8 @@
 // Custom includes
 #include <boost/operators.hpp>
 
-#include "Utils/Exception.hh"
-#include "Utils/SafeBool.hh"
+#include "../Utils/Exception.hh"
+#include "../Utils/SafeBool.hh"
 #include "PacketInterpreter.hh"
 
 //#include "Packet.mpp"
diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh

index 2f8a521..8365924 100644 (file)
--- a/Packets/PacketData.hh
+++ b/Packets/PacketData.hh
@@ -28,7 +28,7 @@
 #include <boost/utility.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include "Utils/SafeBool.hh"
+#include "../Utils/SafeBool.hh"
 #include "PacketTypes.hh"
 
 //#include "PacketData.mpp"
diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh

index 5ec43f6..614eba2 100644 (file)
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -27,7 +27,7 @@
 // Custom includes
 #include <memory>
 #include <boost/utility.hpp>
-#include "Utils/pool_alloc_mixin.hh"
+#include "../Utils/pool_alloc_mixin.hh"
 #include "PacketTypes.hh"
 
 //#include "PacketImpl.mpp"
diff --git a/Packets/PacketInterpreter.hh b/Packets/PacketInterpreter.hh

index 9c6e5bf..927d0ff 100644 (file)
--- a/Packets/PacketInterpreter.hh
+++ b/Packets/PacketInterpreter.hh
@@ -25,15 +25,15 @@
 #define HH_PacketInterpreter_ 1
 
 // Custom includes
-#include <boost/intrusive/ilist.hpp>
+#include "../boost/intrusive/ilist.hpp"
 #include <boost/optional.hpp>
 #include <boost/range.hpp>
 #include <boost/type_traits/aligned_storage.hpp>
 #include <boost/type_traits/alignment_of.hpp>
-#include "Utils/intrusive_refcount.hh"
-#include "Utils/pool_alloc_mixin.hh"
+#include "../Utils/intrusive_refcount.hh"
+#include "../Utils/pool_alloc_mixin.hh"
 #include "PacketData.hh"
-#include "Utils/TypeIdValue.hh"
+#include "../Utils/TypeIdValue.hh"
 
 //#include "PacketInterpreter.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/PacketParser.hh b/Packets/PacketParser.hh

index 2b73860..1b8c214 100644 (file)
--- a/Packets/PacketParser.hh
+++ b/Packets/PacketParser.hh
@@ -150,7 +150,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/optional.hpp>
-#include "Utils/SafeBool.hh"
+#include "../Utils/SafeBool.hh"
 #include "PacketTypes.hh"
 #include "PacketData.hh"
 
diff --git a/Packets/PacketParser.ih b/Packets/PacketParser.ih

index 2fb098a..defec14 100644 (file)
--- a/Packets/PacketParser.ih
+++ b/Packets/PacketParser.ih
@@ -25,7 +25,7 @@
 #define IH_PacketParser_ 1
 
 // Custom includes
-#include "Utils/mpl.hh"
+#include "../Utils/mpl.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
diff --git a/Packets/PacketRegistry.hh b/Packets/PacketRegistry.hh

index 172a233..c1e1798 100644 (file)
--- a/Packets/PacketRegistry.hh
+++ b/Packets/PacketRegistry.hh
@@ -30,7 +30,7 @@
 #include <map>
 #include <boost/utility.hpp> // for boost::noncopyable
 #include <boost/optional.hpp>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 #include "Packet.hh"
 
 //#include "PacketRegistry.mpp"
diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih

index 0c83b8e..7b02f21 100644 (file)
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
-#include "Utils/TypeIdValue.hh"
+#include "../Utils/TypeIdValue.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
diff --git a/Packets/PacketTypes.hh b/Packets/PacketTypes.hh

index f710fc7..8d662e6 100644 (file)
--- a/Packets/PacketTypes.hh
+++ b/Packets/PacketTypes.hh
@@ -28,8 +28,8 @@
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include "../boost/intrusive/ilist.hpp"
+#include "../boost/intrusive/ilist_hook.hpp"
 
 //#include "PacketTypes.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Packets/SConscript b/Packets/SConscript

index 37de48e..4f738bb 100644 (file)
--- a/Packets/SConscript
+++ b/Packets/SConscript
@@ -5,17 +5,8 @@ import SENFSCons, glob
 
 ###########################################################################
 
-def makeAllIncludesHH(target, headers):
-    file(env.File(target).abspath,"w").write("".join([ '#include "%s"\n' % f
-                                                       for f in headers ]))
-
-###########################################################################
-
-source_headers = [ f for f in glob.glob("*.hh")
-                   if 'defined(SENF_PACKETS_DECL_ONLY)' in file(f).read() ]
-source_headers.sort()
-makeAllIncludesHH('all_includes.hh', source_headers)
-env.Clean('all','all_includes.hh')
+SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
+                               if 'defined(SENF_PACKETS_DECL_ONLY)' in file(f).read() ])
 
 SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env,
diff --git a/SConstruct b/SConstruct

index 13e6954..ed68a67 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -74,7 +74,7 @@ if not logname:
     logname = pwd.getpwuid(os.getuid()).pw_name
 
 env.Append(
-   CPPPATH = [ '#' ],
+   CPPPATH = [ ],
    LIBS = [ 'iberty', '$BOOSTREGEXLIB' ],
    DOXY_XREF_TYPES = [ 'bug', 'fixme', 'todo', 'idea' ],
    DOXY_HTML_XSL = '#/doclib/html-munge.xsl',
@@ -94,6 +94,16 @@ Export('env')
 if not env.GetOption('clean') and not os.path.exists("Doxyfile.local"):
     Execute(Touch("Doxyfile.local"))
 
+# Create config.h
+file("config.h","w").write(
+"""#ifndef H_config_
+#define H_config_ 1
+// This looks stupid. However, we need this since the debian packaged Version
+// of SENF is installed in a 'senf' subdirectory which the source Version is not
+#define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) <%s/senf_relative_include_file_path>
+#endif
+""" % env.Dir('#').abspath)
+
 ###########################################################################
 # Define build targets
 
@@ -131,3 +141,5 @@ env.Clean('all', [ os.path.join(path,f)
                    for path, subdirs, files in os.walk('.')
                    for pattern in env['CLEAN_PATTERNS']
                    for f in fnmatch.filter(files,pattern) ])
+
+env.Clean('all', 'config.h')
diff --git a/Scheduler/ClockService.cc b/Scheduler/ClockService.cc

index f31ec4f..e481c14 100644 (file)
--- a/Scheduler/ClockService.cc
+++ b/Scheduler/ClockService.cc
@@ -31,7 +31,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <pthread.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 //#include "ClockService.mpp"
 #define prefix_
diff --git a/Scheduler/ClockService.cci b/Scheduler/ClockService.cci

index b0ab1ca..640c806 100644 (file)
--- a/Scheduler/ClockService.cci
+++ b/Scheduler/ClockService.cci
@@ -24,7 +24,7 @@
     \brief ClockService inline non-template implementation */
 
 // Custom includes
-#include "boost/date_time/posix_time/posix_time_types.hpp"
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
diff --git a/Scheduler/ClockService.hh b/Scheduler/ClockService.hh

index b2cf6db..d17eaf9 100644 (file)
--- a/Scheduler/ClockService.hh
+++ b/Scheduler/ClockService.hh
@@ -30,7 +30,7 @@
 #include <boost/utility.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/scoped_ptr.hpp>
-#include "Utils/singleton.hh"
+#include "../Utils/singleton.hh"
 
 //#include "ClockService.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Scheduler/ReadHelper.ct b/Scheduler/ReadHelper.ct

index ce7e75c..e39eb4f 100644 (file)
--- a/Scheduler/ReadHelper.ct
+++ b/Scheduler/ReadHelper.ct
@@ -25,8 +25,8 @@
 
 // Custom includes
 #include <errno.h>
-#include "Utils/membind.hh"
-#include "Utils/Exception.hh"
+#include "../Utils/membind.hh"
+#include "../Utils/Exception.hh"
 #include "Scheduler.hh"
 
 #define prefix_
diff --git a/Scheduler/ReadHelper.cti b/Scheduler/ReadHelper.cti

index 380091a..92d1264 100644 (file)
--- a/Scheduler/ReadHelper.cti
+++ b/Scheduler/ReadHelper.cti
@@ -24,7 +24,7 @@
 #include "ReadHelper.ih"
 
 // Custom includes
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh

index 449532f..34246e2 100644 (file)
--- a/Scheduler/ReadHelper.hh
+++ b/Scheduler/ReadHelper.hh
@@ -30,7 +30,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include "Utils/intrusive_refcount.hh"
+#include "../Utils/intrusive_refcount.hh"
 #include "Scheduler.hh"
 
 //#include "ReadHelper.mpp"
diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc

index c758ea9..e6e8b85 100644 (file)
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -78,7 +78,7 @@
 // Custom includes
 #include <errno.h>
 #include <sys/epoll.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 static const int EPollInitialSize = 16;
 
diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct

index 758d8b5..485c1e7 100644 (file)
--- a/Scheduler/WriteHelper.ct
+++ b/Scheduler/WriteHelper.ct
@@ -25,7 +25,7 @@
 
 // Custom includes
 #include <errno.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 #include "Scheduler.hh"
 
 #define prefix_
diff --git a/Scheduler/WriteHelper.cti b/Scheduler/WriteHelper.cti

index e57f0e5..a6a928a 100644 (file)
--- a/Scheduler/WriteHelper.cti
+++ b/Scheduler/WriteHelper.cti
@@ -24,7 +24,7 @@
 //#include "WriteHelper.ih"
 
 // Custom includes
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
diff --git a/Scheduler/WriteHelper.hh b/Scheduler/WriteHelper.hh

index 4fa3162..c0bf145 100644 (file)
--- a/Scheduler/WriteHelper.hh
+++ b/Scheduler/WriteHelper.hh
@@ -28,7 +28,7 @@
 #include <string>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/function.hpp>
-#include "Utils/intrusive_refcount.hh"
+#include "../Utils/intrusive_refcount.hh"
 #include "Scheduler.hh"
 
 //#include "WriteHelper.mpp"
diff --git a/Socket/BufferingPolicy.cc b/Socket/BufferingPolicy.cc

index 099bc15..c0983b9 100644 (file)
--- a/Socket/BufferingPolicy.cc
+++ b/Socket/BufferingPolicy.cc
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 //#include "BufferingPolicy.mpp"
 #define prefix_
diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct

index b51abbd..1b8190c 100644 (file)
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <algorithm>
-#include "Utils/Buffer.hh"
+#include "../Utils/Buffer.hh"
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
diff --git a/Socket/ClientSocketHandle.ih b/Socket/ClientSocketHandle.ih

index 6000c5d..83f49bc 100644 (file)
--- a/Socket/ClientSocketHandle.ih
+++ b/Socket/ClientSocketHandle.ih
@@ -25,7 +25,7 @@
 #define IH_ClientSocketHandle_ 1
 
 // Custom includes
-#include "Utils/IteratorTraits.hh"
+#include "../Utils/IteratorTraits.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
diff --git a/Socket/CommunicationPolicy.cc b/Socket/CommunicationPolicy.cc

index 0a1fb73..407dc54 100644 (file)
--- a/Socket/CommunicationPolicy.cc
+++ b/Socket/CommunicationPolicy.cc
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 #include "ServerSocketHandle.hh"
 
 //#include "CommunicationPolicy.mpp"
diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc

index 0cc9b79..9110b6b 100644 (file)
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci

index 7016131..312bc4e 100644 (file)
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <errno.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh

index afb4cd2..584ba59 100644 (file)
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -59,7 +59,7 @@
 
 // Custom includes
 #include <memory> // std::auto_ptr
-#include "Utils/SafeBool.hh"
+#include "../Utils/SafeBool.hh"
 
 //#include "FileHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih

index acde015..bd5b1c7 100644 (file)
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -29,8 +29,8 @@
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
-#include "Utils/intrusive_refcount.hh"
-#include "Utils/pool_alloc_mixin.hh"
+#include "../Utils/intrusive_refcount.hh"
+#include "../Utils/pool_alloc_mixin.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
diff --git a/Socket/ProtocolClientSocketHandle.cti b/Socket/ProtocolClientSocketHandle.cti

index 751cf80..0eb568c 100644 (file)
--- a/Socket/ProtocolClientSocketHandle.cti
+++ b/Socket/ProtocolClientSocketHandle.cti
@@ -47,7 +47,7 @@ prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::ProtocolClientSocketHa
     this->protocol().init_client();
 }
 
-#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, "Socket/ProtocolClientSocketHandle.mpp", 2))
+#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, SENF_ABSOLUTE_INCLUDE_PATH(Socket/ProtocolClientSocketHandle.mpp), 2))
 #include BOOST_PP_ITERATE()
 
 template <class SocketProtocol>
diff --git a/Socket/ProtocolClientSocketHandle.hh b/Socket/ProtocolClientSocketHandle.hh

index bc39504..c40515b 100644 (file)
--- a/Socket/ProtocolClientSocketHandle.hh
+++ b/Socket/ProtocolClientSocketHandle.hh
@@ -29,6 +29,7 @@
 
 // Custom includes
 #include "ClientSocketHandle.hh"
+#include "../config.h"
 
 #include "ProtocolClientSocketHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -82,7 +83,7 @@ namespace senf {
          */
         ProtocolClientSocketHandle();
 
-#       define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, "Socket/ProtocolClientSocketHandle.mpp", 1))
+#       define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, SENF_ABSOLUTE_INCLUDE_PATH(Socket/ProtocolClientSocketHandle.mpp), 1))
 #       include BOOST_PP_ITERATE()
 
         /** \brief Create uninitialized socket variable
diff --git a/Socket/ProtocolServerSocketHandle.cti b/Socket/ProtocolServerSocketHandle.cti

index b104c49..fe7d838 100644 (file)
--- a/Socket/ProtocolServerSocketHandle.cti
+++ b/Socket/ProtocolServerSocketHandle.cti
@@ -45,7 +45,7 @@ prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>::ProtocolServerSocketHa
         std::auto_ptr<senf::SocketProtocol>(new SocketProtocol()))
 {}
 
-#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, "Socket/ProtocolServerSocketHandle.mpp", 2))
+#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, SENF_ABSOLUTE_INCLUDE_PATH(Socket/ProtocolServerSocketHandle.mpp), 2))
 #include BOOST_PP_ITERATE()
 
 template <class SocketProtocol>
diff --git a/Socket/ProtocolServerSocketHandle.hh b/Socket/ProtocolServerSocketHandle.hh

index d0a358f..bd9200d 100644 (file)
--- a/Socket/ProtocolServerSocketHandle.hh
+++ b/Socket/ProtocolServerSocketHandle.hh
@@ -87,7 +87,7 @@ namespace senf {
 
         ProtocolServerSocketHandle();
 
-#       define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, "Socket/ProtocolServerSocketHandle.mpp", 1))
+#       define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, SENF_ABSOLUTE_INCLUDE_PATH(Socket/ProtocolServerSocketHandle.mpp), 1))
 #       include BOOST_PP_ITERATE()
 
         /** \brief Create uninitialized socket variable
diff --git a/Socket/Protocols/BSDSocketProtocol.cc b/Socket/Protocols/BSDSocketProtocol.cc

index 55b9c88..cd30a73 100644 (file)
--- a/Socket/Protocols/BSDSocketProtocol.cc
+++ b/Socket/Protocols/BSDSocketProtocol.cc
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include "Socket/SocketHandle.hh"
+#include "../../Socket/SocketHandle.hh"
 
 //#include "BSDSocketProtocol.mpp"
 #define prefix_
diff --git a/Socket/Protocols/BSDSocketProtocol.hh b/Socket/Protocols/BSDSocketProtocol.hh

index cd38828..3b800c1 100644 (file)
--- a/Socket/Protocols/BSDSocketProtocol.hh
+++ b/Socket/Protocols/BSDSocketProtocol.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <sys/time.h>
-#include "Socket/SocketProtocol.hh"
+#include "../../Socket/SocketProtocol.hh"
 
 //#include "BSDSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.cc b/Socket/Protocols/DVB/DVBDemuxHandles.cc

index b0e83ab..13c70dd 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxHandles.cc
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.cc
@@ -31,7 +31,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "DVBDemuxHandles.mpp"
 #define prefix_
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.hh b/Socket/Protocols/DVB/DVBDemuxHandles.hh

index fcef798..f85d268 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxHandles.hh
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.hh
@@ -27,11 +27,11 @@
 #define HH_DVBDemuxHandles_ 1
 
 // Custom includes
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/BufferingPolicy.hh"
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
 #include "DVBDemuxProtocol.hh"
 
 //#include "DVBDemuxHandles.mpp"
diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.cc b/Socket/Protocols/DVB/DVBDemuxProtocol.cc

index 0e9847f..d4172b3 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.cc
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
@@ -32,7 +32,7 @@
 #include <string>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#include "Socket/SocketHandle.hh"
+#include "../../../Socket/SocketHandle.hh"
 
 //#include "DVBDemuxProtocol.mpp"
 #define prefix_
diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.hh b/Socket/Protocols/DVB/DVBDemuxProtocol.hh

index 56f510a..036bfd5 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.hh
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.hh
@@ -29,7 +29,7 @@
 #include <linux/dvb/dmx.h> 
 
 // Custom includes
-#include "Socket/SocketProtocol.hh"
+#include "../../../Socket/SocketProtocol.hh"
 
 //#include "DVBProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/Socket/Protocols/DVB/DVBFrontendHandle.cc

index 2a87559..a90eca4 100644 (file)
--- a/Socket/Protocols/DVB/DVBFrontendHandle.cc
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.cc
@@ -31,7 +31,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "DVBFrontendHandle.mpp"
 #define prefix_
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/Socket/Protocols/DVB/DVBFrontendHandle.hh

index fcc02cf..c9656dc 100644 (file)
--- a/Socket/Protocols/DVB/DVBFrontendHandle.hh
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.hh
@@ -29,12 +29,12 @@
 // Custom includes
 #include <boost/cstdint.hpp>
 #include <linux/dvb/frontend.h> 
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
-#include "Socket/SocketProtocol.hh"
+#include "../../../Socket/BufferingPolicy.hh"
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/SocketProtocol.hh"
 
 //#include "DVBFrontendHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/GenericAddressingPolicy.cc b/Socket/Protocols/GenericAddressingPolicy.cc

index 2a179a9..70ac3d5 100644 (file)
--- a/Socket/Protocols/GenericAddressingPolicy.cc
+++ b/Socket/Protocols/GenericAddressingPolicy.cc
@@ -30,7 +30,7 @@
 // Custom includes
 #include <sys/socket.h>
 #include <sys/types.h>
-#include "Utils/Exception.hh"
+#include "../../Utils/Exception.hh"
 
 //#include "GenericAddressingPolicy.mpp"
 #define prefix_
diff --git a/Socket/Protocols/GenericAddressingPolicy.hh b/Socket/Protocols/GenericAddressingPolicy.hh

index a289070..cf50c37 100644 (file)
--- a/Socket/Protocols/GenericAddressingPolicy.hh
+++ b/Socket/Protocols/GenericAddressingPolicy.hh
@@ -28,10 +28,10 @@
 #define HH_GenericAddressingPolicy_ 1
 
 // Custom includes
-#include "Socket/SocketHandle.hh"
-#include "Socket/FileHandle.hh"
-#include "Socket/SocketPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
+#include "../../Socket/SocketHandle.hh"
+#include "../../Socket/FileHandle.hh"
+#include "../../Socket/SocketPolicy.hh"
+#include "../../Socket/CommunicationPolicy.hh"
 
 //#include "GenericAddressingPolicy.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc b/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc

index a356068..f2049bc 100644 (file)
--- a/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc
+++ b/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc
@@ -32,7 +32,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "ConnectedUDPSocketHandle.mpp"
 #define prefix_
diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh

index c3d1ed0..2afcdcf 100644 (file)
--- a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
@@ -33,12 +33,12 @@
 // Custom includes
 #include "INetProtocol.hh"
 #include "UDPProtocol.hh"
-#include "Socket/Protocols/BSDSocketProtocol.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/BufferingPolicy.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
 
 //#include "ConnectedUDPSocketHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/INet/INet4Address.hh b/Socket/Protocols/INet/INet4Address.hh

index 1c46498..ffe2289 100644 (file)
--- a/Socket/Protocols/INet/INet4Address.hh
+++ b/Socket/Protocols/INet/INet4Address.hh
@@ -32,7 +32,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/array.hpp>
 #include <boost/operators.hpp>
-#include "Utils/SafeBool.hh"
+#include "../../../Utils/SafeBool.hh"
 
 //#include "INet4Address.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/INet/INet6Address.hh b/Socket/Protocols/INet/INet6Address.hh

index f982016..1639ba3 100644 (file)
--- a/Socket/Protocols/INet/INet6Address.hh
+++ b/Socket/Protocols/INet/INet6Address.hh
@@ -32,7 +32,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/array.hpp>
 #include <boost/operators.hpp>
-#include "Utils/SafeBool.hh"
+#include "../../../Utils/SafeBool.hh"
 #include "INet4Address.hh"
 
 //#include "INet6Address.mpp"
diff --git a/Socket/Protocols/INet/INetAddressing.hh b/Socket/Protocols/INet/INetAddressing.hh

index 40f0a7a..43a13cf 100644 (file)
--- a/Socket/Protocols/INet/INetAddressing.hh
+++ b/Socket/Protocols/INet/INetAddressing.hh
@@ -32,10 +32,10 @@
 #include <exception>
 #include <netinet/in.h>
 #include <boost/operators.hpp>
-#include "Socket/SocketPolicy.hh"
-#include "Socket/ClientSocketHandle.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/Protocols/GenericAddressingPolicy.hh"
+#include "../../../Socket/SocketPolicy.hh"
+#include "../../../Socket/ClientSocketHandle.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/Protocols/GenericAddressingPolicy.hh"
 #include "INet4Address.hh"
 #include "INet6Address.hh"
 
diff --git a/Socket/Protocols/INet/INetProtocol.cc b/Socket/Protocols/INet/INetProtocol.cc

index f4cbff2..e5bd24c 100644 (file)
--- a/Socket/Protocols/INet/INetProtocol.cc
+++ b/Socket/Protocols/INet/INetProtocol.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "INetProtocol.mpp"
 #define prefix_
diff --git a/Socket/Protocols/INet/INetProtocol.hh b/Socket/Protocols/INet/INetProtocol.hh

index 49687c6..98fe3f0 100644 (file)
--- a/Socket/Protocols/INet/INetProtocol.hh
+++ b/Socket/Protocols/INet/INetProtocol.hh
@@ -34,10 +34,10 @@
 #define HH_INetProtocol_ 1
 
 // Custom includes
-#include "Socket/SocketProtocol.hh"
+#include "../../../Socket/SocketProtocol.hh"
 #include "INetAddressing.hh"
-#include "Socket/ClientSocketHandle.hh"
-#include "Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ClientSocketHandle.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
 
 //#include "INetProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/INet/TCPProtocol.cc b/Socket/Protocols/INet/TCPProtocol.cc

index 8edb77f..6c7337d 100644 (file)
--- a/Socket/Protocols/INet/TCPProtocol.cc
+++ b/Socket/Protocols/INet/TCPProtocol.cc
@@ -33,7 +33,7 @@
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
-#include "Socket/SocketHandle.hh"
+#include "../../../Socket/SocketHandle.hh"
 
 //#include "TCPProtocol.mpp"
 #define prefix_
diff --git a/Socket/Protocols/INet/TCPProtocol.hh b/Socket/Protocols/INet/TCPProtocol.hh

index e94202c..b045609 100644 (file)
--- a/Socket/Protocols/INet/TCPProtocol.hh
+++ b/Socket/Protocols/INet/TCPProtocol.hh
@@ -28,7 +28,7 @@
 #define HH_TCPProtocol_ 1
 
 // Custom includes
-#include "Socket/SocketProtocol.hh"
+#include "../../../Socket/SocketProtocol.hh"
 
 //#include "TCPProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/INet/TCPSocketHandle.cc b/Socket/Protocols/INet/TCPSocketHandle.cc

index 07e1def..f68db94 100644 (file)
--- a/Socket/Protocols/INet/TCPSocketHandle.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.cc
@@ -32,7 +32,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "TCPSocketHandle.mpp"
 #define prefix_
diff --git a/Socket/Protocols/INet/TCPSocketHandle.hh b/Socket/Protocols/INet/TCPSocketHandle.hh

index f55f55d..b6ffa81 100644 (file)
--- a/Socket/Protocols/INet/TCPSocketHandle.hh
+++ b/Socket/Protocols/INet/TCPSocketHandle.hh
@@ -31,16 +31,16 @@
 #define HH_TCPSocketHandle_ 1
 
 // Custom includes
-#include "Utils/pool_alloc_mixin.hh"
+#include "../../../Utils/pool_alloc_mixin.hh"
 #include "INetProtocol.hh"
 #include "TCPProtocol.hh"
-#include "Socket/Protocols/BSDSocketProtocol.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
-#include "Socket/ProtocolServerSocketHandle.hh"
+#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/BufferingPolicy.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/ProtocolServerSocketHandle.hh"
 
 //#include "TCPSocketHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/INet/UDPProtocol.cc b/Socket/Protocols/INet/UDPProtocol.cc

index 66b15ac..fd681c9 100644 (file)
--- a/Socket/Protocols/INet/UDPProtocol.cc
+++ b/Socket/Protocols/INet/UDPProtocol.cc
@@ -34,7 +34,7 @@
 #include <sys/ioctl.h>
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
 #include <net/if.h> // for if_nametoindex
-#include "Socket/SocketHandle.hh"
+#include "../../../Socket/SocketHandle.hh"
 
 //#include "UDPProtocol.mpp"
 #define prefix_
diff --git a/Socket/Protocols/INet/UDPProtocol.hh b/Socket/Protocols/INet/UDPProtocol.hh

index a39f5fc..43ffea9 100644 (file)
--- a/Socket/Protocols/INet/UDPProtocol.hh
+++ b/Socket/Protocols/INet/UDPProtocol.hh
@@ -28,7 +28,7 @@
 #define HH_UDPProtocol_ 1
 
 // Custom includes
-#include "Socket/SocketProtocol.hh"
+#include "../../../Socket/SocketProtocol.hh"
 #include "INetAddressing.hh"
 
 //#include "UDPProtocol.mpp"
diff --git a/Socket/Protocols/INet/UDPSocketHandle.cc b/Socket/Protocols/INet/UDPSocketHandle.cc

index 9626033..31e7e8b 100644 (file)
--- a/Socket/Protocols/INet/UDPSocketHandle.cc
+++ b/Socket/Protocols/INet/UDPSocketHandle.cc
@@ -32,7 +32,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "UDPSocketHandle.mpp"
 #define prefix_
diff --git a/Socket/Protocols/INet/UDPSocketHandle.hh b/Socket/Protocols/INet/UDPSocketHandle.hh

index ae1df0f..d081c39 100644 (file)
--- a/Socket/Protocols/INet/UDPSocketHandle.hh
+++ b/Socket/Protocols/INet/UDPSocketHandle.hh
@@ -33,12 +33,12 @@
 // Custom includes
 #include "INetProtocol.hh"
 #include "UDPProtocol.hh"
-#include "Socket/Protocols/BSDSocketProtocol.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/BufferingPolicy.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
 
 //#include "UDPSocketHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/Raw/LLAddressing.cc b/Socket/Protocols/Raw/LLAddressing.cc

index c31b99d..d02b660 100644 (file)
--- a/Socket/Protocols/Raw/LLAddressing.cc
+++ b/Socket/Protocols/Raw/LLAddressing.cc
@@ -34,7 +34,7 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/finder.hpp>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "LLAddressing.mpp"
 #define prefix_
diff --git a/Socket/Protocols/Raw/LLAddressing.hh b/Socket/Protocols/Raw/LLAddressing.hh

index 90bbafc..2728b7c 100644 (file)
--- a/Socket/Protocols/Raw/LLAddressing.hh
+++ b/Socket/Protocols/Raw/LLAddressing.hh
@@ -30,9 +30,9 @@
 // Custom includes
 #include <sys/socket.h>
 #include <netpacket/packet.h>
-#include "Socket/SocketPolicy.hh"
-#include "Socket/FileHandle.hh"
-#include "Socket/Protocols/GenericAddressingPolicy.hh"
+#include "../../../Socket/SocketPolicy.hh"
+#include "../../../Socket/FileHandle.hh"
+#include "../../../Socket/Protocols/GenericAddressingPolicy.hh"
 #include "MACAddress.hh"
 
 //#include "LLAddressing.mpp"
diff --git a/Socket/Protocols/Raw/MACAddress.hh b/Socket/Protocols/Raw/MACAddress.hh

index 8511bb2..33eb687 100644 (file)
--- a/Socket/Protocols/Raw/MACAddress.hh
+++ b/Socket/Protocols/Raw/MACAddress.hh
@@ -30,7 +30,7 @@
 #include <boost/array.hpp>
 #include <boost/utility.hpp>
 #include <boost/type_traits.hpp>
-#include "Utils/SafeBool.hh"
+#include "../../../Utils/SafeBool.hh"
 
 //#include "MACAddress.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/Socket/Protocols/Raw/PacketSocketHandle.hh b/Socket/Protocols/Raw/PacketSocketHandle.hh

index 95c9980..eae839e 100644 (file)
--- a/Socket/Protocols/Raw/PacketSocketHandle.hh
+++ b/Socket/Protocols/Raw/PacketSocketHandle.hh
@@ -30,14 +30,14 @@
 #define HH_PacketSocketHandle_ 1
 
 // Custom includes
-#include "Socket/SocketPolicy.hh"
-#include "Socket/SocketProtocol.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/Protocols/BSDSocketProtocol.hh"
+#include "../../../Socket/SocketPolicy.hh"
+#include "../../../Socket/SocketProtocol.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/BufferingPolicy.hh"
+#include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "LLAddressing.hh"
 
 //#include "PacketSocketHandle.mpp"
diff --git a/Socket/SConscript b/Socket/SConscript

index aef098c..3177782 100644 (file)
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -1,11 +1,13 @@
 # -*- python -*-
 
 Import('env')
-import SENFSCons
-import glob
+import SENFSCons, glob
 
 ###########################################################################
 
+SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
+                               if f not in ('all_includes.hh','Socket.hh') and not f.endswith('.test.hh') ])
+
 sources, testSources = SENFSCons.GlobSources()
 
 SENFSCons.StandardTargets(env)
@@ -29,3 +31,4 @@ SENFSCons.Doxygen(env, extra_sources = [
     env.Dia2Png('Handle.dia'),
 ])
 
+SENFSCons.InstallIncludeFiles(env, [ 'Socket.hh', 'all_includes.hh' ])
diff --git a/Socket/Socket.hh b/Socket/Socket.hh

new file mode 100644 (file)

index 0000000..ad41650
--- /dev/null
+++ b/Socket/Socket.hh
@@ -0,0 +1,42 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief Socket public header */
+
+#ifndef HH_Socket_
+#define HH_Socket_ 1
+
+#include "all_includes.hh"
+
+#endif
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc

index 4d0b8fc..d2ad81c 100644 (file)
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -30,7 +30,7 @@
 // Custom includes
 #include <sstream>
 #include <sys/socket.h>
-#include "Utils/TypeInfo.hh"
+#include "../Utils/TypeInfo.hh"
 
 //#include "SocketHandle.mpp"
 #define prefix_
diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci

index 25ddfc1..a465f19 100644 (file)
--- a/Socket/SocketHandle.cci
+++ b/Socket/SocketHandle.cci
@@ -27,7 +27,7 @@
 #include "SocketHandle.ih"
 
 // Custom includes
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 #include "SocketProtocol.hh"
 
 #define prefix_ inline
diff --git a/Socket/SocketHandle.cti b/Socket/SocketHandle.cti

index 05b3790..aa618bc 100644 (file)
--- a/Socket/SocketHandle.cti
+++ b/Socket/SocketHandle.cti
@@ -29,7 +29,7 @@
 // Custom includes
 #include <typeinfo>
 #include <boost/lexical_cast.hpp>
-#include "Utils/TypeInfo.hh"
+#include "../Utils/TypeInfo.hh"
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
diff --git a/Socket/SocketPolicy.ih b/Socket/SocketPolicy.ih

index 0f70243..ccc0371 100644 (file)
--- a/Socket/SocketPolicy.ih
+++ b/Socket/SocketPolicy.ih
@@ -50,8 +50,8 @@
 #include <boost/mpl/and.hpp>
 #include <boost/utility.hpp> // for enable_if
 
-#include "Utils/mpl.hh"
-#include "Utils/pool_alloc_mixin.hh"
+#include "../Utils/mpl.hh"
+#include "../Utils/pool_alloc_mixin.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
diff --git a/Utils/Buffer.hh b/Utils/Buffer.hh

index 7cf9626..b61d13e 100644 (file)
--- a/Utils/Buffer.hh
+++ b/Utils/Buffer.hh
@@ -78,7 +78,7 @@
         either pointer to \a type or array of \a type:
 
         \code
-          #include "Utils/Buffer.hh"
+          #include "../Utils/Buffer.hh"
 
           void foo(std::string const & str)
           {
diff --git a/Utils/impl/membind.hh b/Utils/impl/membind.hh

index b239423..7dc1930 100644 (file)
--- a/Utils/impl/membind.hh
+++ b/Utils/impl/membind.hh
@@ -27,6 +27,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repetition/enum_shifted.hpp>
 #include <boost/preprocessor/iteration/iterate.hpp>
+#include "../../config.h"
 
 template <typename R, typename T>
 boost::function<R()> membind(R (T::* fn)(),scOBTYPE ob)
@@ -35,7 +36,7 @@ boost::function<R()> membind(R (T::* fn)(),scOBTYPE ob)
 }
 
 // for BOOST_PP_ITERATION() in 2..9 do
-#define BOOST_PP_ITERATION_PARAMS_1 (4, (2, 9, "Utils/impl/membind.hh", 1))
+#define BOOST_PP_ITERATION_PARAMS_1 (4, (2, 9, SENF_ABSOLUTE_INCLUDE_PATH(Utils/impl/membind.hh), 1))
 #include BOOST_PP_ITERATE()
 #elif BOOST_PP_ITERATION_DEPTH()==1 && BOOST_PP_ITERATION_FLAGS()==1
 // {{
diff --git a/Utils/membind.hh b/Utils/membind.hh

index 5cb73d0..6abacff 100644 (file)
--- a/Utils/membind.hh
+++ b/Utils/membind.hh
@@ -58,11 +58,11 @@
 namespace senf {
 
 #define scOBTYPE T *
-#include "Utils/impl/membind.hh"
+#include "../Utils/impl/membind.hh"
 #undef scOBTYPE
 
 #define scOBTYPE T &
-#include "Utils/impl/membind.hh"
+#include "../Utils/impl/membind.hh"
 #undef scOBTYPE
 
 #ifdef DOXYGEN
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc

index f30a00a..3cfbb87 100644 (file)
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include <sstream>
 #include <string>
-#include "Utils/membind.hh"
+#include "../Utils/membind.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
diff --git a/boost/intrusive/detail/ihashtable.hpp b/boost/intrusive/detail/ihashtable.hpp

index 62ea986..f320edb 100644 (file)
--- a/boost/intrusive/detail/ihashtable.hpp
+++ b/boost/intrusive/detail/ihashtable.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_INTRUSIVE_IHASHTABLE_HPP\r
 #define BOOST_INTRUSIVE_IHASHTABLE_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 //std C++\r
 #include <functional>\r
 #include <iterator>\r
@@ -25,12 +25,12 @@
 #include <boost/static_assert.hpp>\r
 #include <boost/functional/hash.hpp>\r
 //General intrusive utilities\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "pointer_type.hpp"\r
+#include "pointer_to_other.hpp"\r
+#include "../linking_policy.hpp"\r
 //Implementation utilities\r
-#include <boost/intrusive/iunordered_set_hook.hpp>\r
-#include <boost/intrusive/islist.hpp>\r
+#include "../iunordered_set_hook.hpp"\r
+#include "../islist.hpp"\r
 #include <cstddef>\r
 #include <iterator>\r
 \r
@@ -1012,6 +1012,6 @@ class ihashtable
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_IHASHTABLE_HPP\r
diff --git a/boost/intrusive/detail/irbtree.hpp b/boost/intrusive/detail/irbtree.hpp

index 067830f..0aff738 100644 (file)
--- a/boost/intrusive/detail/irbtree.hpp
+++ b/boost/intrusive/detail/irbtree.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_INTRUSIVE_IRBTREE_HPP\r
 #define BOOST_INTRUSIVE_IRBTREE_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 #include <functional>\r
 #include <iterator>\r
 #include <boost/utility.hpp>\r
@@ -20,13 +20,13 @@
 #include <utility>\r
 #include <boost/assert.hpp>\r
 #include <boost/static_assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/iset_hook.hpp>\r
-#include <boost/intrusive/detail/rbtree_node.hpp>\r
-#include <boost/intrusive/detail/ebo_holder.hpp>\r
-#include <boost/intrusive/rbtree_algorithms.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "pointer_type.hpp"\r
+#include "pointer_to_other.hpp"\r
+#include "../iset_hook.hpp"\r
+#include "rbtree_node.hpp"\r
+#include "ebo_holder.hpp"\r
+#include "../rbtree_algorithms.hpp"\r
+#include "../linking_policy.hpp"\r
 #include <cstddef>\r
 #include <iterator>\r
 \r
@@ -1183,6 +1183,6 @@ inline void swap(irbtree<V, P, C, S>& x, irbtree<V, P, C, S>& y)
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_IRBTREE_HPP\r
diff --git a/boost/intrusive/detail/list_node.hpp b/boost/intrusive/detail/list_node.hpp

index cfbf97b..6ab4d7f 100644 (file)
--- a/boost/intrusive/detail/list_node.hpp
+++ b/boost/intrusive/detail/list_node.hpp
@@ -14,12 +14,12 @@
 #ifndef BOOST_INTRUSIVE_LIST_NODE_HPP\r
 #define BOOST_INTRUSIVE_LIST_NODE_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 #include <iterator>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/list_algorithms.hpp>\r
+#include "pointer_type.hpp"\r
+#include "pointer_to_other.hpp"\r
+#include "../list_algorithms.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <cstddef>\r
 \r
@@ -123,6 +123,6 @@ class list_iterator
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_LIST_NODE_HPP\r
diff --git a/boost/intrusive/detail/pointer_to_other.hpp b/boost/intrusive/detail/pointer_to_other.hpp

index 6092c97..576e768 100644 (file)
--- a/boost/intrusive/detail/pointer_to_other.hpp
+++ b/boost/intrusive/detail/pointer_to_other.hpp
@@ -11,7 +11,7 @@
 #ifndef BOOST_INTRUSIVE_POINTER_TO_OTHER_HPP\r
 #define BOOST_INTRUSIVE_POINTER_TO_OTHER_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 #include <boost/version.hpp>\r
 \r
 #if (BOOST_VERSION < 103400)
@@ -60,6 +60,6 @@ struct pointer_to_other< T*, U >
 \r
 #endif   //#ifndef BOOST_POINTER_TO_OTHER_HPP_INCLUDED\r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif   //#ifndef BOOST_INTRUSIVE_POINTER_TO_OTHER_HPP\r
diff --git a/boost/intrusive/detail/pointer_type.hpp b/boost/intrusive/detail/pointer_type.hpp

index 245fcac..065250f 100644 (file)
--- a/boost/intrusive/detail/pointer_type.hpp
+++ b/boost/intrusive/detail/pointer_type.hpp
@@ -11,7 +11,7 @@
 #ifndef BOOST_INTRUSIVE_POINTER_TYPE_HPP\r
 #define BOOST_INTRUSIVE_POINTER_TYPE_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 \r
 namespace boost {\r
 namespace intrusive {\r
@@ -49,6 +49,6 @@ struct pointer_type<T, A, false>
 }  //namespace intrusive\r
 } // namespace boost\r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif   //#ifndef BOOST_INTRUSIVE_POINTER_TYPE_HPP\r
diff --git a/boost/intrusive/detail/rbtree_node.hpp b/boost/intrusive/detail/rbtree_node.hpp

index f72d79f..f6b7688 100644 (file)
--- a/boost/intrusive/detail/rbtree_node.hpp
+++ b/boost/intrusive/detail/rbtree_node.hpp
@@ -39,12 +39,12 @@
 #ifndef BOOST_INTRUSIVE_RBTREE_NODE_HPP\r
 #define BOOST_INTRUSIVE_RBTREE_NODE_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 #include <iterator>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/rbtree_algorithms.hpp>\r
+#include "pointer_type.hpp"\r
+#include "pointer_to_other.hpp"\r
+#include "../rbtree_algorithms.hpp"\r
 #include <boost/get_pointer.hpp>\r
 //#include <boost/interprocess/offset_ptr.hpp>\r
 #include <boost/type_traits/alignment_of.hpp>\r
@@ -354,6 +354,6 @@ class rbtree_iterator
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_RBTREE_NODE_HPP\r
diff --git a/boost/intrusive/detail/slist_node.hpp b/boost/intrusive/detail/slist_node.hpp

index d3ea2f3..f7921ba 100644 (file)
--- a/boost/intrusive/detail/slist_node.hpp
+++ b/boost/intrusive/detail/slist_node.hpp
@@ -14,12 +14,12 @@
 #ifndef BOOST_INTRUSIVE_SLIST_NODE_HPP\r
 #define BOOST_INTRUSIVE_SLIST_NODE_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "config_begin.hpp"\r
 #include <iterator>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/slist_algorithms.hpp>\r
+#include "pointer_type.hpp"\r
+#include "pointer_to_other.hpp"\r
+#include "../slist_algorithms.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <cstddef>\r
 \r
@@ -105,6 +105,6 @@ class slist_iterator
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_SLIST_NODE_HPP\r
diff --git a/boost/intrusive/detail/utilities.hpp b/boost/intrusive/detail/utilities.hpp

index bafa9de..d142334 100644 (file)
--- a/boost/intrusive/detail/utilities.hpp
+++ b/boost/intrusive/detail/utilities.hpp
@@ -13,9 +13,9 @@
 #ifndef BOOST_INTRUSIVE_DETAIL_UTILITIES_HPP\r
 #define BOOST_INTRUSIVE_DETAIL_UTILITIES_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
+#include "config_begin.hpp"\r
+#include "pointer_type.hpp"\r
+#include "pointer_to_other.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <cstddef>\r
 \r
@@ -166,6 +166,6 @@ struct member_value_traits
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_DETAIL_UTILITIES_HPP\r
diff --git a/boost/intrusive/ilist.hpp b/boost/intrusive/ilist.hpp

index 3947a7b..1115703 100644 (file)
--- a/boost/intrusive/ilist.hpp
+++ b/boost/intrusive/ilist.hpp
@@ -14,14 +14,14 @@
 #ifndef BOOST_INTRUSIVE_ILIST_HPP\r
 #define BOOST_INTRUSIVE_ILIST_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "detail/config_begin.hpp"\r
 #include <boost/utility.hpp>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/ilist_hook.hpp>\r
-#include <boost/intrusive/list_algorithms.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "ilist_hook.hpp"\r
+#include "list_algorithms.hpp"\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
+#include "linking_policy.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <boost/static_assert.hpp>\r
 #include <iterator>\r
@@ -1195,6 +1195,6 @@ inline void swap(ilist<V, C, S>& x, ilist<V, C, S>& y)
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_ILIST_HPP\r
diff --git a/boost/intrusive/ilist_hook.hpp b/boost/intrusive/ilist_hook.hpp

index 86e5f0b..32a2dc6 100644 (file)
--- a/boost/intrusive/ilist_hook.hpp
+++ b/boost/intrusive/ilist_hook.hpp
@@ -14,13 +14,13 @@
 #ifndef BOOST_INTRUSIVE_ILIST_HOOK_HPP\r
 #define BOOST_INTRUSIVE_ILIST_HOOK_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/utilities.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/detail/list_node.hpp>\r
-#include <boost/intrusive/list_algorithms.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "detail/config_begin.hpp"\r
+#include "detail/utilities.hpp"\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
+#include "detail/list_node.hpp"\r
+#include "list_algorithms.hpp"\r
+#include "linking_policy.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <stdexcept>\r
 \r
@@ -720,6 +720,6 @@ class ilist_auto_member_hook
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_ILIST_HOOK_HPP\r
diff --git a/boost/intrusive/iset.hpp b/boost/intrusive/iset.hpp

index 7edd34b..4634fac 100644 (file)
--- a/boost/intrusive/iset.hpp
+++ b/boost/intrusive/iset.hpp
@@ -13,8 +13,8 @@
 #ifndef BOOST_INTRUSIVE_ISET_HPP\r
 #define BOOST_INTRUSIVE_ISET_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/irbtree.hpp>\r
+#include "detail/config_begin.hpp"\r
+#include "detail/irbtree.hpp"\r
 #include <iterator>\r
 \r
 namespace boost {\r
@@ -1567,6 +1567,6 @@ inline void swap(imultiset<V, P, C, S>& x, imultiset<V, P, C, S>& y)
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_ISET_HPP\r
diff --git a/boost/intrusive/iset_hook.hpp b/boost/intrusive/iset_hook.hpp

index 539e593..cc6a225 100644 (file)
--- a/boost/intrusive/iset_hook.hpp
+++ b/boost/intrusive/iset_hook.hpp
@@ -14,13 +14,13 @@
 #ifndef BOOST_INTRUSIVE_ISET_HOOK_HPP\r
 #define BOOST_INTRUSIVE_ISET_HOOK_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/utilities.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/detail/rbtree_node.hpp>\r
-#include <boost/intrusive/rbtree_algorithms.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "detail/config_begin.hpp"\r
+#include "detail/utilities.hpp"\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
+#include "detail/rbtree_node.hpp"\r
+#include "rbtree_algorithms.hpp"\r
+#include "linking_policy.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <stdexcept>\r
 \r
@@ -685,6 +685,6 @@ class iset_auto_member_hook
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_ISET_HOOK_HPP\r
diff --git a/boost/intrusive/islist.hpp b/boost/intrusive/islist.hpp

index a66ace6..5c0478c 100644 (file)
--- a/boost/intrusive/islist.hpp
+++ b/boost/intrusive/islist.hpp
@@ -14,16 +14,16 @@
 #ifndef BOOST_INTRUSIVE_ISLIST_HPP\r
 #define BOOST_INTRUSIVE_ISLIST_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "detail/config_begin.hpp"\r
 #include <boost/utility.hpp>\r
 #include <boost/static_assert.hpp>\r
 #include <boost/assert.hpp>\r
 #include <boost/type_traits/is_convertible.hpp>\r
-#include <boost/intrusive/islist_hook.hpp>\r
-#include <boost/intrusive/slist_algorithms.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "islist_hook.hpp"\r
+#include "slist_algorithms.hpp"\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
+#include "linking_policy.hpp"\r
 #include <iterator>\r
 #include <cstddef>\r
 \r
@@ -1386,6 +1386,6 @@ inline void swap(islist<V, C, S>& x, islist<V, C, S>& y)
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_ISLIST_HPP\r
diff --git a/boost/intrusive/islist_hook.hpp b/boost/intrusive/islist_hook.hpp

index f69064d..206103d 100644 (file)
--- a/boost/intrusive/islist_hook.hpp
+++ b/boost/intrusive/islist_hook.hpp
@@ -14,13 +14,13 @@
 #ifndef BOOST_INTRUSIVE_ISLIST_HOOK_HPP\r
 #define BOOST_INTRUSIVE_ISLIST_HOOK_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/utilities.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/detail/slist_node.hpp>\r
-#include <boost/intrusive/slist_algorithms.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "detail/config_begin.hpp"\r
+#include "detail/utilities.hpp"\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
+#include "detail/slist_node.hpp"\r
+#include "slist_algorithms.hpp"\r
+#include "linking_policy.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <stdexcept>\r
 \r
diff --git a/boost/intrusive/iunordered_set.hpp b/boost/intrusive/iunordered_set.hpp

index 73e6d17..72f3dea 100644 (file)
--- a/boost/intrusive/iunordered_set.hpp
+++ b/boost/intrusive/iunordered_set.hpp
@@ -13,8 +13,8 @@
 #ifndef BOOST_INTRUSIVE_IHASHSET_HPP\r
 #define BOOST_INTRUSIVE_IHASHSET_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/ihashtable.hpp>\r
+#include "detail/config_begin.hpp"\r
+#include "detail/ihashtable.hpp"\r
 #include <iterator>\r
 \r
 namespace boost {\r
@@ -1649,6 +1649,6 @@ class iunordered_multiset
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_IHASHSET_HPP\r
diff --git a/boost/intrusive/iunordered_set_hook.hpp b/boost/intrusive/iunordered_set_hook.hpp

index 2c059ca..c79ac2c 100644 (file)
--- a/boost/intrusive/iunordered_set_hook.hpp
+++ b/boost/intrusive/iunordered_set_hook.hpp
@@ -14,12 +14,12 @@
 #ifndef BOOST_INTRUSIVE_IHASHSET_HOOK_HPP\r
 #define BOOST_INTRUSIVE_IHASHSET_HOOK_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
-#include <boost/intrusive/detail/utilities.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
-#include <boost/intrusive/islist_hook.hpp>\r
-#include <boost/intrusive/linking_policy.hpp>\r
+#include "detail/config_begin.hpp"\r
+#include "detail/utilities.hpp"\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
+#include "islist_hook.hpp"\r
+#include "linking_policy.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <stdexcept>\r
 \r
@@ -565,6 +565,6 @@ class iunordered_set_auto_member_hook
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_IHASHSET_HOOK_HPP\r
diff --git a/boost/intrusive/list_algorithms.hpp b/boost/intrusive/list_algorithms.hpp

index 8e16de2..56b7c8d 100644 (file)
--- a/boost/intrusive/list_algorithms.hpp
+++ b/boost/intrusive/list_algorithms.hpp
@@ -14,11 +14,11 @@
 #ifndef BOOST_INTRUSIVE_LIST_ALGORITHMS_HPP\r
 #define BOOST_INTRUSIVE_LIST_ALGORITHMS_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "detail/config_begin.hpp"\r
 #include <iterator>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <cstddef>\r
 \r
@@ -284,6 +284,6 @@ class list_algorithms
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_LIST_ALGORITHMS_HPP\r
diff --git a/boost/intrusive/rbtree_algorithms.hpp b/boost/intrusive/rbtree_algorithms.hpp

index 96c47f4..045c669 100644 (file)
--- a/boost/intrusive/rbtree_algorithms.hpp
+++ b/boost/intrusive/rbtree_algorithms.hpp
@@ -39,11 +39,11 @@
 #ifndef BOOST_INTRUSIVE_RBTREE_ALGORITHMS_HPP\r
 #define BOOST_INTRUSIVE_RBTREE_ALGORITHMS_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "detail/config_begin.hpp"\r
 #include <iterator>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <boost/type_traits/alignment_of.hpp>\r
 #include <cstddef>\r
@@ -1156,6 +1156,6 @@ class rbtree_algorithms
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_RBTREE_ALGORITHMS_HPP\r
diff --git a/boost/intrusive/slist_algorithms.hpp b/boost/intrusive/slist_algorithms.hpp

index b88ad10..19158ce 100644 (file)
--- a/boost/intrusive/slist_algorithms.hpp
+++ b/boost/intrusive/slist_algorithms.hpp
@@ -14,11 +14,11 @@
 #ifndef BOOST_INTRUSIVE_SLIST_ALGORITHMS_HPP\r
 #define BOOST_INTRUSIVE_SLIST_ALGORITHMS_HPP\r
 \r
-#include <boost/intrusive/detail/config_begin.hpp>\r
+#include "detail/config_begin.hpp"\r
 #include <iterator>\r
 #include <boost/assert.hpp>\r
-#include <boost/intrusive/detail/pointer_type.hpp>\r
-#include <boost/intrusive/detail/pointer_to_other.hpp>\r
+#include "detail/pointer_type.hpp"\r
+#include "detail/pointer_to_other.hpp"\r
 #include <boost/get_pointer.hpp>\r
 #include <cstddef>\r
 \r
@@ -241,6 +241,6 @@ class slist_algorithms
 } //namespace intrusive \r
 } //namespace boost \r
 \r
-#include <boost/intrusive/detail/config_end.hpp>\r
+#include "detail/config_end.hpp"\r
 \r
 #endif //BOOST_INTRUSIVE_SLIST_ALGORITHMS_HPP\r
diff --git a/debian/PPI.hh b/debian/PPI.hh

new file mode 100644 (file)

index 0000000..1ae8be8
--- /dev/null
+++ b/debian/PPI.hh
@@ -0,0 +1,34 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "PPI/PPI.hh"
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/debian/Packets.hh b/debian/Packets.hh

new file mode 100644 (file)

index 0000000..2fc2096
--- /dev/null
+++ b/debian/Packets.hh
@@ -0,0 +1,34 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "Packets/Packets.hh"
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/debian/Socket.hh b/debian/Socket.hh

new file mode 100644 (file)

index 0000000..48e6e36
--- /dev/null
+++ b/debian/Socket.hh
@@ -0,0 +1,37 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief Socket public header */
+
+#include "Socket/Socket.hh"
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/debian/config.h b/debian/config.h

new file mode 100644 (file)

index 0000000..c30ab03
--- /dev/null
+++ b/debian/config.h
@@ -0,0 +1,51 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief config public header */
+
+#ifndef H_config_
+#define H_config_ 1
+
+// Custom includes
+
+//#include "config.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+#define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) <senf/senf_relative_include_file_path>
+
+///////////////////////////////hh.e////////////////////////////////////////
+//#include "config.cci"
+//#include "config.ct"
+//#include "config.cti"
+#endif
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/debian/libsenf-dev.install b/debian/libsenf-dev.install

index 2bcc289..1fc59c5 100644 (file)
--- a/debian/libsenf-dev.install
+++ b/debian/libsenf-dev.install
@@ -1,4 +1,13 @@
 debian/tmp/usr/lib/libsenf.a
 debian/tmp/usr/lib/*.o usr/lib/senf-packets
-debian/tmp/usr/include
+debian/tmp/usr/include/Packets usr/include/senf
+debian/tmp/usr/include/PPI usr/include/senf
+debian/tmp/usr/include/Scheduler usr/include/senf
+debian/tmp/usr/include/Socket usr/include/senf
+debian/tmp/usr/include/Utils usr/include/senf
+boost usr/include/senf
+debian/config.h usr/include/senf
+debian/Socket.hh usr/include/senf
+debian/Packets.hh usr/include/senf
+debian/PPI.hh usr/include/senf
 README usr/share/doc/libsenf-dev
diff --git a/debian/rules b/debian/rules

index 558debd..b6a8e66 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ install: build
        dh_clean -k 
        dh_installdirs
 #      # Add here commands to install the package into debian/tmp
-       scons -j $(CONCURRENCY_LEVEL) install_all final=1\
+       scons  install_all final=1\
                PREFIX='$(destdir)/usr' \
                DOCINSTALLDIR='$$PREFIX/share/doc/libsenf-doc'
 #       We need to install the example sourcecode
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py

index fd969c5..373b5d6 100644 (file)
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -346,6 +346,13 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []):
 
     return objects
 
+def InstallIncludeFiles(env, files):
+    target = env.Dir(env['INCLUDEINSTALLDIR'])
+    base = env.Dir(env['INSTALL_BASE'])
+    for f in files:
+        src = env.File(f)
+        env.Alias('install_all', env.Install(target.Dir(src.dir.get_path(base)), src))
+
 def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes = False):
     if type(sources) is type(()):
         sources, testSources = sources
@@ -363,7 +370,6 @@ def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes
         source = targets
         if testSources:
             source.append( env.File('.test.bin') )
-            
             installs.append(env.InstallIncludes(
                 target = target,
                 source = targets,
@@ -617,3 +623,10 @@ def Binary(env, binary, sources, testSources = None, LIBS = [], OBJECTS = [], no
                                      no_includes)
         env.Alias('install_all', install)
     return program
+
+def AllIncludesHH(env, headers):
+    headers.sort()
+    file(env.File("all_includes.hh").abspath,"w").write("".join([ '#include "%s"\n' % f
+                                                                  for f in headers ]))
+    env.Clean('all','all_includes.hh')
+
Examples/DVBAdapter/MPEdec.cc		patch \| blob \| history
Examples/DVBAdapter/ULEdec.cc		patch \| blob \| history
Examples/DVBAdapter/ULEdec.hh		patch \| blob \| history
Examples/DVBAdapter/frontend.cc		patch \| blob \| history
Examples/MCSniffer/MCSniffer.cc		patch \| blob \| history
Examples/RateStuffer/ratestuffer.cc		patch \| blob \| history
Examples/Sniffer/Sniffer.cc		patch \| blob \| history
Examples/TCPClientServer/client.cc		patch \| blob \| history
Examples/TCPClientServer/server.cc		patch \| blob \| history
PPI/CloneSource.hh		patch \| blob \| history
PPI/CloneSource.test.cc		patch \| blob \| history
PPI/Connectors.hh		patch \| blob \| history
PPI/DebugModules.cti		patch \| blob \| history
PPI/DebugModules.hh		patch \| blob \| history
PPI/DebugModules.test.cc		patch \| blob \| history
PPI/EventManager.cci		patch \| blob \| history
PPI/EventManager.hh		patch \| blob \| history
PPI/Events.hh		patch \| blob \| history
PPI/IOEvent.hh		patch \| blob \| history
PPI/IdleEvent.cc		patch \| blob \| history
PPI/IntervalTimer.cc		patch \| blob \| history
PPI/IntervalTimer.hh		patch \| blob \| history
PPI/Joins.test.cc		patch \| blob \| history
PPI/Module.hh		patch \| blob \| history
PPI/ModuleManager.cc		patch \| blob \| history
PPI/PPI.hh	[new file with mode: 0644]	patch \| blob
PPI/PassiveQueue.test.cc		patch \| blob \| history
PPI/Queueing.test.cc		patch \| blob \| history
PPI/SConscript		patch \| blob \| history
PPI/SocketReader.hh		patch \| blob \| history
PPI/SocketReader.test.cc		patch \| blob \| history
PPI/SocketWriter.hh		patch \| blob \| history
PPI/SocketWriter.test.cc		patch \| blob \| history
PPI/ThrottleBarrier.test.cc		patch \| blob \| history
PPI/detail/EventBinding.hh		patch \| blob \| history
Packets/DefaultBundle/EthernetPacket.hh		patch \| blob \| history
Packets/DefaultBundle/IpV4Packet.hh		patch \| blob \| history
Packets/DefaultBundle/IpV6Extensions.test.cc		patch \| blob \| history
Packets/DefaultBundle/IpV6Packet.cc		patch \| blob \| history
Packets/DefaultBundle/IpV6Packet.hh		patch \| blob \| history
Packets/DefaultBundle/IpV6Packet.test.cc		patch \| blob \| history
Packets/DefaultBundle/UDPPacket.cc		patch \| blob \| history
Packets/DefaultBundle/UDPPacket.hh		patch \| blob \| history
Packets/MPEGDVBBundle/DSMCCSection.hh		patch \| blob \| history
Packets/MPEGDVBBundle/DatagramSection.hh		patch \| blob \| history
Packets/MPEGDVBBundle/SNDUPacket.cc		patch \| blob \| history
Packets/MPEGDVBBundle/SNDUPacket.hh		patch \| blob \| history
Packets/MPEGDVBBundle/TransportPacket.hh		patch \| blob \| history
Packets/Packet.hh		patch \| blob \| history
Packets/PacketData.hh		patch \| blob \| history
Packets/PacketImpl.hh		patch \| blob \| history
Packets/PacketInterpreter.hh		patch \| blob \| history
Packets/PacketParser.hh		patch \| blob \| history
Packets/PacketParser.ih		patch \| blob \| history
Packets/PacketRegistry.hh		patch \| blob \| history
Packets/PacketRegistry.ih		patch \| blob \| history
Packets/PacketTypes.hh		patch \| blob \| history
Packets/SConscript		patch \| blob \| history
SConstruct		patch \| blob \| history
Scheduler/ClockService.cc		patch \| blob \| history
Scheduler/ClockService.cci		patch \| blob \| history
Scheduler/ClockService.hh		patch \| blob \| history
Scheduler/ReadHelper.ct		patch \| blob \| history
Scheduler/ReadHelper.cti		patch \| blob \| history
Scheduler/ReadHelper.hh		patch \| blob \| history
Scheduler/Scheduler.cc		patch \| blob \| history
Scheduler/WriteHelper.ct		patch \| blob \| history
Scheduler/WriteHelper.cti		patch \| blob \| history
Scheduler/WriteHelper.hh		patch \| blob \| history
Socket/BufferingPolicy.cc		patch \| blob \| history
Socket/ClientSocketHandle.ct		patch \| blob \| history
Socket/ClientSocketHandle.ih		patch \| blob \| history
Socket/CommunicationPolicy.cc		patch \| blob \| history
Socket/FileHandle.cc		patch \| blob \| history
Socket/FileHandle.cci		patch \| blob \| history
Socket/FileHandle.hh		patch \| blob \| history
Socket/FileHandle.ih		patch \| blob \| history
Socket/ProtocolClientSocketHandle.cti		patch \| blob \| history
Socket/ProtocolClientSocketHandle.hh		patch \| blob \| history
Socket/ProtocolServerSocketHandle.cti		patch \| blob \| history
Socket/ProtocolServerSocketHandle.hh		patch \| blob \| history
Socket/Protocols/BSDSocketProtocol.cc		patch \| blob \| history
Socket/Protocols/BSDSocketProtocol.hh		patch \| blob \| history
Socket/Protocols/DVB/DVBDemuxHandles.cc		patch \| blob \| history
Socket/Protocols/DVB/DVBDemuxHandles.hh		patch \| blob \| history
Socket/Protocols/DVB/DVBDemuxProtocol.cc		patch \| blob \| history
Socket/Protocols/DVB/DVBDemuxProtocol.hh		patch \| blob \| history
Socket/Protocols/DVB/DVBFrontendHandle.cc		patch \| blob \| history
Socket/Protocols/DVB/DVBFrontendHandle.hh		patch \| blob \| history
Socket/Protocols/GenericAddressingPolicy.cc		patch \| blob \| history
Socket/Protocols/GenericAddressingPolicy.hh		patch \| blob \| history
Socket/Protocols/INet/ConnectedUDPSocketHandle.cc		patch \| blob \| history
Socket/Protocols/INet/ConnectedUDPSocketHandle.hh		patch \| blob \| history
Socket/Protocols/INet/INet4Address.hh		patch \| blob \| history
Socket/Protocols/INet/INet6Address.hh		patch \| blob \| history
Socket/Protocols/INet/INetAddressing.hh		patch \| blob \| history
Socket/Protocols/INet/INetProtocol.cc		patch \| blob \| history
Socket/Protocols/INet/INetProtocol.hh		patch \| blob \| history
Socket/Protocols/INet/TCPProtocol.cc		patch \| blob \| history
Socket/Protocols/INet/TCPProtocol.hh		patch \| blob \| history
Socket/Protocols/INet/TCPSocketHandle.cc		patch \| blob \| history
Socket/Protocols/INet/TCPSocketHandle.hh		patch \| blob \| history
Socket/Protocols/INet/UDPProtocol.cc		patch \| blob \| history
Socket/Protocols/INet/UDPProtocol.hh		patch \| blob \| history
Socket/Protocols/INet/UDPSocketHandle.cc		patch \| blob \| history
Socket/Protocols/INet/UDPSocketHandle.hh		patch \| blob \| history
Socket/Protocols/Raw/LLAddressing.cc		patch \| blob \| history
Socket/Protocols/Raw/LLAddressing.hh		patch \| blob \| history
Socket/Protocols/Raw/MACAddress.hh		patch \| blob \| history
Socket/Protocols/Raw/PacketSocketHandle.hh		patch \| blob \| history
Socket/SConscript		patch \| blob \| history
Socket/Socket.hh	[new file with mode: 0644]	patch \| blob
Socket/SocketHandle.cc		patch \| blob \| history
Socket/SocketHandle.cci		patch \| blob \| history
Socket/SocketHandle.cti		patch \| blob \| history
Socket/SocketPolicy.ih		patch \| blob \| history
Utils/Buffer.hh		patch \| blob \| history
Utils/impl/membind.hh		patch \| blob \| history
Utils/membind.hh		patch \| blob \| history
Utils/membind.test.cc		patch \| blob \| history
boost/intrusive/detail/ihashtable.hpp		patch \| blob \| history
boost/intrusive/detail/irbtree.hpp		patch \| blob \| history
boost/intrusive/detail/list_node.hpp		patch \| blob \| history
boost/intrusive/detail/pointer_to_other.hpp		patch \| blob \| history
boost/intrusive/detail/pointer_type.hpp		patch \| blob \| history
boost/intrusive/detail/rbtree_node.hpp		patch \| blob \| history
boost/intrusive/detail/slist_node.hpp		patch \| blob \| history
boost/intrusive/detail/utilities.hpp		patch \| blob \| history
boost/intrusive/ilist.hpp		patch \| blob \| history
boost/intrusive/ilist_hook.hpp		patch \| blob \| history
boost/intrusive/iset.hpp		patch \| blob \| history
boost/intrusive/iset_hook.hpp		patch \| blob \| history
boost/intrusive/islist.hpp		patch \| blob \| history
boost/intrusive/islist_hook.hpp		patch \| blob \| history
boost/intrusive/iunordered_set.hpp		patch \| blob \| history
boost/intrusive/iunordered_set_hook.hpp		patch \| blob \| history
boost/intrusive/list_algorithms.hpp		patch \| blob \| history
boost/intrusive/rbtree_algorithms.hpp		patch \| blob \| history
boost/intrusive/slist_algorithms.hpp		patch \| blob \| history
debian/PPI.hh	[new file with mode: 0644]	patch \| blob
debian/Packets.hh	[new file with mode: 0644]	patch \| blob
debian/Socket.hh	[new file with mode: 0644]	patch \| blob
debian/config.h	[new file with mode: 0644]	patch \| blob
debian/libsenf-dev.install		patch \| blob \| history
debian/rules		patch \| blob \| history
senfscons/SENFSCons.py		patch \| blob \| history