move message dir into common

CMakeLists.txt

@@ -146,6 +146,5 @@ endif()
 
 
 add_subdirectory(common)
-add_subdirectory(message)
 add_subdirectory(server)
 add_subdirectory(client)

client/CMakeLists.txt

@@ -11,6 +11,7 @@ set(CLIENT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} common message)
 
 set(CLIENT_INCLUDE
     ${CMAKE_SOURCE_DIR}/client
+    ${CMAKE_SOURCE_DIR}/common
     ${ASIO_INCLUDE_DIRS}
     ${POPL_INCLUDE_DIRS})
 

client/Makefile

@@ -34,9 +34,9 @@ endif
 DEBUG=-O3
 
 
-CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals
+CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals -I../common
 LDFLAGS   = -logg -lFLAC
-OBJ       = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/oggDecoder.o decoder/flacDecoder.o controller.o ../message/pcmChunk.o ../common/sampleFormat.o
+OBJ       = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/oggDecoder.o decoder/flacDecoder.o controller.o ../common/message/pcmChunk.o ../common/sampleFormat.o
 
 
 ifneq (,$(TARGET))

client/decoder/flacDecoder.cpp

@@ -21,7 +21,7 @@
 #include <cmath>
 #include "flacDecoder.h"
 #include "common/snapException.h"
-#include "common/endian.h"
+#include "common/endian.hpp"
 #include "aixlog.hpp"
 
 

client/decoder/oggDecoder.cpp

@@ -22,7 +22,7 @@
 
 #include "oggDecoder.h"
 #include "common/snapException.h"
-#include "common/endian.h"
+#include "common/endian.hpp"
 #include "aixlog.hpp"
 
 

client/decoder/pcmDecoder.cpp

@@ -17,7 +17,7 @@
 ***/
 
 #include "common/snapException.h"
-#include "common/endian.h"
+#include "common/endian.hpp"
 #include "aixlog.hpp"
 #include "pcmDecoder.h"
 

client/player/player.h

@@ -25,7 +25,7 @@
 #include <vector>
 #include "stream.h"
 #include "pcmDevice.h"
-#include "common/endian.h"
+#include "common/endian.hpp"
 #include "aixlog.hpp"
 
 

common/CMakeLists.txt

@@ -1 +1,2 @@
 add_library(common STATIC daemon.cpp sampleFormat.cpp)
+add_subdirectory(message)

common/message/message.h

@@ -25,7 +25,7 @@
 #include <streambuf>
 #include <vector>
 #include <sys/time.h>
-#include "common/endian.h"
+#include "common/endian.hpp"
 #include "common/timeDefs.h"
 
 

server/CMakeLists.txt

@@ -25,6 +25,7 @@ set(SERVER_LIBRARIES
 
 set(SERVER_INCLUDE
     ${CMAKE_SOURCE_DIR}/server
+    ${CMAKE_SOURCE_DIR}/common
     ${FLAC_INCLUDE_DIRS})
 
 # Avahi

server/Makefile

@@ -34,9 +34,9 @@ endif
 DEBUG=-O3
 
 
-CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals
+CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals -I../common
 LDFLAGS   = -lvorbis -lvorbisenc -logg -lFLAC 
-OBJ       = snapServer.o config.o controlServer.o controlSession.o jsonrp.o streamServer.o streamSession.o streamreader/streamUri.o streamreader/streamManager.o streamreader/pcmStream.o streamreader/pipeStream.o streamreader/fileStream.o streamreader/processStream.o streamreader/airplayStream.o streamreader/spotifyStream.o streamreader/watchdog.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o ../common/sampleFormat.o ../message/pcmChunk.o ../common/base64.o
+OBJ       = snapServer.o config.o controlServer.o controlSession.o jsonrp.o streamServer.o streamSession.o streamreader/streamUri.o streamreader/streamManager.o streamreader/pcmStream.o streamreader/pipeStream.o streamreader/fileStream.o streamreader/processStream.o streamreader/airplayStream.o streamreader/spotifyStream.o streamreader/watchdog.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o ../common/sampleFormat.o ../common/message/pcmChunk.o ../common/base64.o
 
 ifneq (,$(TARGET))
 CXXFLAGS += -D$(TARGET)

server/encoder/pcmEncoder.cpp

@@ -17,7 +17,7 @@
 ***/
 
 #include <memory>
-#include "common/endian.h"
+#include "common/endian.hpp"
 #include "pcmEncoder.h"