cumulative update from bitbucket

filelist.mk

@@ -1,25 +1,16 @@
-COMMON_SRC = \
-  CryptoConst.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
+LIB_SRC = \
+  Crypto.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
   Log.cpp NTCPSession.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp \
   Reseed.cpp RouterContext.cpp RouterInfo.cpp Signature.cpp SSU.cpp \
   SSUSession.cpp SSUData.cpp Streaming.cpp Identity.cpp TransitTunnel.cpp \
   Transports.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp TunnelGateway.cpp \
-  Destination.cpp UPnP.cpp util.cpp aes.cpp base64.cpp
-
-
-ifeq ($(UNAME),Darwin)
-# This is needed on OS X for some reason I don't understand (yet).
-# Else will get linker error about unknown symbols. - torkel
-	COMMON_SRC += \
-	  AddressBook.cpp BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp SAM.cpp SOCKS.cpp \
-	  UPnP.cpp HTTPServer.cpp HTTPProxy.cpp i2p.cpp DaemonLinux.cpp I2PControl.cpp
-endif
+  Destination.cpp Base.cpp util.cpp api.cpp
 
+LIB_CLIENT_SRC = \
+	AddressBook.cpp BOB.cpp ClientContext.cpp I2PTunnel.cpp I2PService.cpp \
+	SAM.cpp SOCKS.cpp HTTPProxy.cpp 
 
 # also: Daemon{Linux,Win32}.cpp will be added later
-DAEMON_SRC = $(COMMON_SRC) \
-	AddressBook.cpp BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp \
-	SAM.cpp SOCKS.cpp HTTPServer.cpp HTTPProxy.cpp I2PControl.cpp i2p.cpp
+DAEMON_SRC = \
+	HTTPServer.cpp I2PControl.cpp UPnP.cpp Daemon.cpp i2pd.cpp
 
-LIB_SRC := $(COMMON_SRC) \
-  api.cpp