Index: /source/ariba/Makefile.am
===================================================================
--- /source/ariba/Makefile.am	(revision 2460)
+++ /source/ariba/Makefile.am	(revision 2461)
@@ -1,4 +1,13 @@
+# the rocking Ariba library
+
 lib_LTLIBRARIES     = libariba.la
-libariba_la_SOURCES =
+
+# source files and header files
+# header files get installed using
+# make install. the nobase_ prefix
+# keeps the directory structure
+
+libariba_la_SOURCES        =
+nobase_libariba_la_HEADERS =
 
 # compiler flags ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -43,87 +52,118 @@
 # sources and subdirs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#tidy interface
+# where to put the libs into -> /ariba
+# currently we have no version number
+# attached to the header/libs folder
+libariba_ladir = ${pkgincludedir}
+
+# ------------> tidy interface
+
 libariba_la_SOURCES += \
   AribaModule.cpp \
+  CommunicationListener.cpp \
+  Identifiers.cpp \
+  LinkProperties.cpp \
+  DataMessage.cpp \
+  Module.cpp \
+  Name.cpp \
+  Node.cpp \
+  NodeListener.cpp \
+  SpoVNetProperties.cpp
+
+nobase_libariba_la_HEADERS += \
+  ariba.h \
   AribaModule.h \
-  CommunicationListener.cpp \
   CommunicationListener.h \
-  Identifiers.cpp \
   Identifiers.h \
-  LinkProperties.cpp \
   LinkProperties.h \
   Message.h \
-  DataMessage.cpp \
   DataMessage.h \
-  Module.cpp \
   Module.h \
-  Name.cpp \
   Name.h \
-  Node.cpp \
   Node.h \
-  NodeListener.cpp \
   NodeListener.h \
-  SpoVNetProperties.cpp \
   SpoVNetProperties.h
 
-#communication
+# ------------> communication
+
 libariba_la_SOURCES += \
   communication/BaseCommunication.cpp \
+  communication/CommunicationEvents.cpp \
+  communication/EndpointDescriptor.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/BaseCommunication.h \
-  communication/CommunicationEvents.cpp \
   communication/CommunicationEvents.h \
-  communication/EndpointDescriptor.cpp \
   communication/EndpointDescriptor.h
 
-#communication :: messages
-libariba_la_SOURCES += \
-  communication/messages/AribaBaseMsg.cpp \
+# ------------> communication :: messages
+
+libariba_la_SOURCES += \
+  communication/messages/AribaBaseMsg.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/messages/AribaBaseMsg.h
 
-#communication :: modules
-libariba_la_SOURCES += \
+# ------------> communication :: modules
+
+nobase_libariba_la_HEADERS += \
   communication/modules/modules.h \
   communication/modules/_namespace.h
 
-#communication :: modules :: network
+# ------------> communication :: modules :: network
 libariba_la_SOURCES += \
   communication/modules/network/NetworkLocator.cpp \
+  communication/modules/network/NetworkProtocol.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/modules/network/NetworkLocator.h \
-  communication/modules/network/NetworkProtocol.cpp \
   communication/modules/network/NetworkProtocol.h
 
-#communication :: modules :: network :: ip
+# ------------> communication :: modules :: network :: ip
+
 libariba_la_SOURCES += \
   communication/modules/network/ip/IPv4Locator.cpp \
+  communication/modules/network/ip/IPv4NetworkProtocol.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/modules/network/ip/IPv4Locator.h  \
-  communication/modules/network/ip/IPv4NetworkProtocol.cpp \
   communication/modules/network/ip/IPv4NetworkProtocol.h
 
-if OMNET
-#communication :: modules :: network :: omnet
-libariba_la_SOURCES += \
-  communication/modules/network/omnet/OmnetNetworkProtocol.cpp \
+# ------------> communication :: modules :: network :: omnet
+
+if OMNET
+libariba_la_SOURCES += \
+  communication/modules/network/omnet/OmnetNetworkProtocol.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/modules/network/omnet/OmnetNetworkProtocol.h
 endif
 
-#communication :: modules :: transport
+#------------> communication :: modules :: transport
+
 libariba_la_SOURCES += \
   communication/modules/transport/TransportLocator.cpp \
+  communication/modules/transport/TransportProtocol.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/modules/transport/TransportLocator.h \
-  communication/modules/transport/TransportProtocol.cpp \
   communication/modules/transport/TransportProtocol.h
 
-if OMNET
-#communication :: modules :: transport :: omnet
+#------------> communication :: modules :: transport :: omnet
+
+if OMNET
 libariba_la_SOURCES += \
   communication/modules/transport/omnet/AribaOmnetMessage_m.cc \
+  communication/modules/transport/omnet/AribaOmnetModule.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/modules/transport/omnet/AribaOmnetMessage_m.h \
-  communication/modules/transport/omnet/AribaOmnetModule.cpp \
   communication/modules/transport/omnet/AribaOmnetModule.h
 endif
 
+#------------> communication :: modules :: transport :: protlib
+
 if OMNET
 else
-#communication :: modules :: transport :: protlib
 libariba_la_SOURCES += \
   communication/modules/transport/protlib/timer_module.cpp \
@@ -149,5 +189,7 @@
   communication/modules/transport/protlib/fastqueue.c \
   communication/modules/transport/protlib/eclock_gettime.c \
-  communication/modules/transport/protlib/testqueue.c \
+  communication/modules/transport/protlib/testqueue.c
+
+nobase_libariba_la_HEADERS += \
   communication/modules/transport/protlib/tp_over_uds.h \
   communication/modules/transport/protlib/threadsafe_db.h \
@@ -179,140 +221,169 @@
 endif
 
+#------------> communication :: modules :: transport :: tcp
+
 if OMNET
 else
-#communication :: modules :: transport :: tcp
 libariba_la_SOURCES += \
   communication/modules/transport/tcp/TCPTransport.cpp \
+  communication/modules/transport/tcp/TCPTransportLocator.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/modules/transport/tcp/TCPTransport.h \
-  communication/modules/transport/tcp/TCPTransportLocator.cpp \
   communication/modules/transport/tcp/TCPTransportLocator.h
 endif
 
-#communication :: networkinfo
+#------------> communication :: networkinfo
+
 libariba_la_SOURCES += \
   communication/networkinfo/AddressInformation.cpp \
+  communication/networkinfo/NetworkChangeDetection.cpp \
+  communication/networkinfo/NetworkInformation.cpp \
+  communication/networkinfo/NetworkInterface.cpp
+
+nobase_libariba_la_HEADERS += \
   communication/networkinfo/AddressInformation.h \
-  communication/networkinfo/NetworkChangeDetection.cpp \
   communication/networkinfo/NetworkChangeDetection.h \
   communication/networkinfo/NetworkChangeInterface.h \
   communication/networkinfo/NetworkInterface.h \
-  communication/networkinfo/NetworkInformation.cpp \
-  communication/networkinfo/NetworkInformation.h \
-  communication/networkinfo/NetworkInterface.cpp
-
-#interface
+  communication/networkinfo/NetworkInformation.h
+
+#------------> interface
+
 libariba_la_SOURCES += \
   interface/UnderlayAbstraction.cpp \
+  interface/AribaContext.cpp \
+  interface/ServiceInterface.cpp
+
+nobase_libariba_la_HEADERS += \
   interface/UnderlayAbstraction.h \
-  interface/AribaContext.cpp \
   interface/AribaContext.h \
-  interface/ServiceInterface.cpp \
   interface/ServiceInterface.h
 
-#overlay
+#------------> overlay
+
 libariba_la_SOURCES += \
   overlay/BaseOverlay.cpp \
+  overlay/OverlayEvents.cpp
+
+nobase_libariba_la_HEADERS += \
   overlay/BaseOverlay.h \
-  overlay/OverlayEvents.cpp \
   overlay/OverlayEvents.h
 
-#overlay :: messages
+#------------> overlay :: messages
+
 libariba_la_SOURCES += \
   overlay/messages/JoinReply.cpp \
+  overlay/messages/JoinRequest.cpp \
+  overlay/messages/OverlayMsg.cpp
+
+nobase_libariba_la_HEADERS += \
   overlay/messages/JoinReply.h \
-  overlay/messages/JoinRequest.cpp \
   overlay/messages/JoinRequest.h \
-  overlay/messages/OverlayMsg.cpp \
   overlay/messages/OverlayMsg.h
 
-#overlay :: modules
+#------------> overlay :: modules
+
 libariba_la_SOURCES += \
   overlay/modules/OverlayStructureEvents.cpp \
+  overlay/modules/OverlayFactory.cpp \
+  overlay/modules/OverlayInterface.cpp
+
+nobase_libariba_la_HEADERS += \
   overlay/modules/OverlayStructureEvents.h \
-  overlay/modules/OverlayFactory.cpp \
   overlay/modules/OverlayFactory.h \
-  overlay/modules/OverlayInterface.cpp \
   overlay/modules/OverlayInterface.h
 
-#overlay :: modules :: chord
-# libariba_la_SOURCES += \
-#   overlay/modules/chord/ChordSuccessorList.h \
-#   overlay/modules/chord/Chord.h \
-#   overlay/modules/chord/ChordFingerTable.h \
-#   overlay/modules/chord/ChordSuccessorList.cc \
-#   overlay/modules/chord/Chord.cc \
-#   overlay/modules/chord/ChordFingerTable.cc
-
-#overlay :: modules :: onehop
+#------------> overlay :: modules :: onehop
+
 libariba_la_SOURCES += \
   overlay/modules/onehop/OneHop.cpp \
+  overlay/modules/onehop/messages/OneHopMessage.cpp \
+  overlay/modules/onehop/messages/NodeListingRequest.cpp \
+  overlay/modules/onehop/messages/NodeListingReply.cpp
+
+nobase_libariba_la_HEADERS += \
   overlay/modules/onehop/OneHop.h \
-  overlay/modules/onehop/messages/OneHopMessage.cpp \
   overlay/modules/onehop/messages/OneHopMessage.h \
-  overlay/modules/onehop/messages/NodeListingRequest.cpp \
   overlay/modules/onehop/messages/NodeListingRequest.h \
-  overlay/modules/onehop/messages/NodeListingReply.cpp \
   overlay/modules/onehop/messages/NodeListingReply.h
 
-#utility
-libariba_la_SOURCES += \
+#------------> utility
+
+nobase_libariba_la_HEADERS += \
   utility/types.h \
   utility/messages.h \
   utility/serialization.h
 
-#utility :: configuration
+#------------> utility :: configuration
+
 libariba_la_SOURCES += \
   utility/configuration/ConfigFile.cpp \
+  utility/configuration/Configuration.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/configuration/ConfigFile.h \
-  utility/configuration/Configuration.cpp \
   utility/configuration/Configuration.h
 
-#utility :: internal
-libariba_la_SOURCES += \
+#------------> utility :: internal
+
+nobase_libariba_la_HEADERS += \
   utility/internal/Utilities.hpp
 
-#utility :: logging
-libariba_la_SOURCES += \
+#------------> utility :: logging
+
+nobase_libariba_la_HEADERS += \
   utility/logging/Logging.h
 
-#utility :: measurement
-libariba_la_SOURCES += \
-  utility/measurement/PathloadMeasurement.cpp \
+#------------> utility :: measurement
+
+libariba_la_SOURCES += \
+  utility/measurement/PathloadMeasurement.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/measurement/PathloadMeasurement.h
 
-#utility :: messages
-libariba_la_SOURCES += \
+#------------> utility :: messages
+
+libariba_la_SOURCES += \
+  utility/messages/Message.cpp \
+  utility/messages/MessageControlInfo.cpp \
+  utility/messages/MessageProvider.cpp \
+  utility/messages/MessageReceiver.cpp \
+  utility/messages/MessageSender.cpp \
+  utility/messages/TextMessage.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/messages/_namespace.h \
-  utility/messages/Message.cpp \
   utility/messages/Message.h \
-  utility/messages/MessageControlInfo.cpp \
   utility/messages/MessageControlInfo.h \
-  utility/messages/MessageProvider.cpp \
   utility/messages/MessageProvider.h \
-  utility/messages/MessageReceiver.cpp \
   utility/messages/MessageReceiver.h \
-  utility/messages/MessageSender.cpp \
   utility/messages/MessageSender.h \
   utility/messages/MessageUtilities.h \
-  utility/messages/TextMessage.cpp \
   utility/messages/TextMessage.h
 
-#utility :: misc
-libariba_la_SOURCES += \
+#------------> utility :: misc
+
+libariba_la_SOURCES += \
+  utility/misc/Helper.cpp \
+  utility/misc/OvlVis.cpp \
+  utility/misc/sha1.cpp \
+  utility/misc/StringFormat.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/misc/Demultiplexer.hpp \
-  utility/misc/Helper.cpp \
   utility/misc/Helper.h \
   utility/misc/KeyMapping.hpp \
-  utility/misc/OvlVis.cpp \
   utility/misc/OvlVis.h \
-  utility/misc/sha1.cpp \
   utility/misc/sha1.h \
-  utility/misc/StringFormat.cpp \
-  utility/misc/StringFormat.h 
-  
-
-#utility :: serialization
-libariba_la_SOURCES += \
-  utility/serialization/Serialization.cpp \
+  utility/misc/StringFormat.h
+
+#------------> utility :: serialization
+
+libariba_la_SOURCES += \
+  utility/serialization/Serialization.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/serialization/DataUtilities.hpp \
   utility/serialization/Serialization.hpp \
@@ -320,83 +391,50 @@
   utility/serialization/DataStream.hpp
 
-#utility :: system
+#------------> utility :: system
+
 libariba_la_SOURCES += \
   utility/system/BlockingMethod.cpp \
+  utility/system/SystemEvent.cpp \
+  utility/system/SystemEventListener.cpp \
+  utility/system/SystemEventType.cpp \
+  utility/system/SystemQueue.cpp \
+  utility/system/Timer.cpp \
+  utility/system/StartupWrapper.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/system/BlockingMethod.h \
-  utility/system/SystemEvent.cpp \
   utility/system/SystemEvent.h \
-  utility/system/SystemEventListener.cpp \
   utility/system/SystemEventListener.h \
-  utility/system/SystemEventType.cpp \
   utility/system/SystemEventType.h \
-  utility/system/SystemQueue.cpp \
   utility/system/SystemQueue.h \
-  utility/system/Timer.cpp \
   utility/system/Timer.h \
-  utility/system/StartupWrapper.cpp \
   utility/system/StartupWrapper.h \
   utility/system/StartupInterface.h
 
-#utility :: types
-libariba_la_SOURCES += \
+#------------> utility :: types
+
+libariba_la_SOURCES += \
+  utility/types/Address.cpp \
+  utility/types/Identifier.cpp \
+  utility/types/LinkID.cpp \
+  utility/types/Locator.cpp \
+  utility/types/NodeID.cpp \
+  utility/types/OverlayParameterSet.cpp \
+  utility/types/QoSParameterSet.cpp \
+  utility/types/SecurityParameterSet.cpp \
+  utility/types/ServiceID.cpp \
+  utility/types/SpoVNetID.cpp
+
+nobase_libariba_la_HEADERS += \
   utility/types/_namespace.h \
-  utility/types/Address.cpp \
   utility/types/Address.h \
   utility/types/Data.hpp \
-  utility/types/Identifier.cpp \
   utility/types/Identifier.h \
-  utility/types/LinkID.cpp \
   utility/types/LinkID.h \
-  utility/types/Locator.cpp \
   utility/types/Locator.h \
-  utility/types/NodeID.cpp \
   utility/types/NodeID.h \
-  utility/types/OverlayParameterSet.cpp \
   utility/types/OverlayParameterSet.h \
-  utility/types/QoSParameterSet.cpp \
   utility/types/QoSParameterSet.h \
-  utility/types/SecurityParameterSet.cpp \
   utility/types/SecurityParameterSet.h \
-  utility/types/ServiceID.cpp \
   utility/types/ServiceID.h \
-  utility/types/SpoVNetID.cpp \
   utility/types/SpoVNetID.h
-
-# make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# libariba_ladir = ${pkgincludedir}
-# 
-# #interfaces headers for make install - don't 
-# #remove the here listed .h files from _SOURCES!
-# libariba_la_HEADERS = \
-#   tidy/ariba.h \
-#   tidy/AribaModule.h \
-#   tidy/DataMessage.h \
-#   tidy/Identifiers.h \
-#   tidy/LinkProperties.h \
-#   tidy/Module.h \
-#   tidy/Name.h \
-#   tidy/Node.h \
-#   tidy/NodeListener.h \
-#   tidy/SpoVNetProperties.h \
-#   tidy/TidyCommunicationListener.h \
-#   tidy/TidyMessage.h
-
-# old make install stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#autotools does not support hierarchical folders in the header dir
-#so we copy them on our own using, similar to 14.3 in the autobook
-# header files to install - TODO: extract all *.h and *.hpp files ~~~~
-
-libariba_ladir = ${pkgincludedir}
-
-install-data-local:
-	@for f in $(libariba_la_SOURCES); do \
-		d=`echo $$f | sed -e 's,/[^/]*$$,,'`; \
-		$(mkinstalldirs) $(DESTDIR)$(libariba_ladir)/$$d; \
-		if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
-		$(INSTALL_DATA) $$p $(DESTDIR)$(libariba_ladir)/$$f; \
-	done
-
-uninstall-local:
-	rm -rf $(DESTDIR)$(libariba_ladir)