--- a/servlib/Makefile Tue Apr 26 14:43:43 2011 +0100
+++ b/servlib/Makefile Wed May 04 15:42:50 2011 +0100
@@ -22,41 +22,43 @@
# Source and object rules
#
-BUNDLING_SRCS := \
- bundling/APIBlockProcessor.cc \
- bundling/BlockInfo.cc \
- bundling/BlockProcessor.cc \
- bundling/Bundle.cc \
- bundling/BundleActions.cc \
- bundling/BundleDaemon.cc \
+BUNDLING_SRCS := \
+ bundling/APIBlockProcessor.cc \
+ bundling/BlockInfo.cc \
+ bundling/BlockProcessor.cc \
+ bundling/BPQBlockProcessor.cc \
+ bundling/BPQBlock.cc \
+ bundling/Bundle.cc \
+ bundling/BundleActions.cc \
+ bundling/BundleDaemon.cc \
bundling/BundleEventHandler.cc \
- bundling/BundleInfoCache.cc \
- bundling/BundleList.cc \
- bundling/BundleMappings.cc \
- bundling/BundlePayload.cc \
- bundling/BundleProtocol.cc \
+ bundling/BundleInfoCache.cc \
+ bundling/BundleList.cc \
+ bundling/BundleMappings.cc \
+ bundling/BundlePayload.cc \
+ bundling/BundleProtocol.cc \
bundling/BundleStatusReport.cc \
- bundling/BundleTimestamp.cc \
- bundling/CustodySignal.cc \
- bundling/CustodyTimer.cc \
+ bundling/BundleTimestamp.cc \
+ bundling/CustodySignal.cc \
+ bundling/CustodyTimer.cc \
bundling/Dictionary.cc \
- bundling/ForwardingInfo.cc \
- bundling/ForwardingLog.cc \
- bundling/FragmentManager.cc \
- bundling/FragmentState.cc \
- bundling/ExpirationTimer.cc \
+ bundling/ForwardingInfo.cc \
+ bundling/ForwardingLog.cc \
+ bundling/FragmentManager.cc \
+ bundling/FragmentState.cc \
+ bundling/ExpirationTimer.cc \
bundling/GbofId.cc \
- bundling/MetadataBlock.cc \
+ bundling/MetadataBlock.cc \
bundling/MetadataBlockProcessor.cc \
bundling/PayloadBlockProcessor.cc \
bundling/PreviousHopBlockProcessor.cc \
bundling/PrimaryBlockProcessor.cc \
- bundling/SDNV.cc \
+ bundling/SDNV.cc \
bundling/SessionBlockProcessor.cc \
- bundling/SequenceID.cc \
- bundling/SequenceIDBlockProcessor.cc \
+ bundling/SequenceID.cc \
+ bundling/SequenceIDBlockProcessor.cc\
bundling/UnknownBlockProcessor.cc \
- bundling/S10Logger.cc \
+ bundling/S10Logger.cc \
CONTACT_SRCS := \
contacts/AlwaysOnLink.cc \