[meta] Restructure repository

Place wzdma and CMSSW files under own subdirectories and move external libraries to a dedicated root-level directory.
Adapt Makefile in src directory accordingly.

src/Makefile

@@ -13,7 +13,7 @@ TARGET = scdaq
 
 # source files
 SOURCES = pipeline.cc config.cc DmaInputFilter.cc FileDmaInputFilter.cc InputFilter.cc MicronDmaInputFilter.cc OutputByOrbit.cc OutputBySize.cc OutputFileHandler.cc processor.cc scdaq.cc session.cc slice.cc TcpInputFilter.cc tools.cc WZDmaInputFilter.cc
-C_SOURCES = wz_dma.c
+C_SOURCES = wzdma/wz_dma.c
 
 # work out names of object files from sources
 OBJECTS = $(SOURCES:.cc=.o)
@@ -29,7 +29,7 @@ CXXFLAGS = -std=c++11 -Wall -Wextra -Og -g -rdynamic -Wconversion
 
 CFLAGS = $(CXXFLAGS)
 LDFLAGS = -Llibmicron -ltbb -ltbbmalloc -lboost_thread -lboost_chrono -lcurl -lpthread -lcrypto
-CPPFLAGS = -I. -Iwzdma
+CPPFLAGS = -I. -Iwzdma -Icmssw
 
 
 # default target (to build all)
@@ -64,13 +64,13 @@ FileDmaInputFilter.o:	FileDmaInputFilter.h InputFilter.h log.h
 InputFilter.o:	InputFilter.h log.h
 OutputBySize.o:	OutputBySize.h slice.h log.h
 OutputByOrbit.o:	OutputByOrbit.h OutputFileHandler.h slice.h log.h OutputFile.h
-OutputFileHandler.o: OutputFileHandler.h log.h OutputFile.h FRDFileHeader_v2.h
-processor.o:	processor.h slice.h format.h log.h bril_histo.h FRDEventHeader_V6.h FRDFileHeader_v2.h
+OutputFileHandler.o: OutputFileHandler.h log.h OutputFile.h cmssw/FRDFileHeader_v2.h
+processor.o:	processor.h slice.h format.h log.h bril_histo.h cmssw/FRDEventHeader_V6.h cmssw/FRDFileHeader_v2.h
 session.o:	session.h log.h
 slice.o: 	slice.h
 WZDmaInputFilter.o:	WZDmaInputFilter.h InputFilter.h tools.h log.h
 TcpInputFilter.o:	TcpInputFilter.h InputFilter.h tools.h log.h
-wz_dma.o:	wz_dma.h
+wz_dma.o:	wzdma/wz_dma.h
 MicronDmaInputFilter.o: MicronDmaInputFilter.h
 tools.o: tools.h log.h
 pipeline.o: pipeline.h

src/OutputFile.h

@@ -11,7 +11,7 @@
 #include <utility>
 #include <vector>
 
-#include "FRDFileHeader_v2.h"
+#include "cmssw/FRDFileHeader_v2.h"
 #include "tbb/concurrent_queue.h"
 
 class OutputFile {

src/OutputFileHandler.h

@@ -8,8 +8,8 @@
 #include <thread>
 #include <utility>
 
-#include "FRDFileHeader_v2.h"
 #include "OutputFile.h"
+#include "cmssw/FRDFileHeader_v2.h"
 #include "format.h"
 #include "tbb/concurrent_queue.h"
 

src/WZDmaInputFilter.h

@@ -8,7 +8,7 @@
 #include "config.h"
 #include "tbb/pipeline.h"
 #include "tbb/tick_count.h"
-#include "wz_dma.h"
+#include "wzdma/wz_dma.h"
 
 class WZDmaInputFilter : public InputFilter {
  public:

src/processor.h

@@ -9,8 +9,8 @@
 #include <utility>
 #include <vector>
 
-#include "FRDEventHeader_V6.h"
-#include "FRDFileHeader_v2.h"
+#include "cmssw/FRDEventHeader_V6.h"
+#include "cmssw/FRDFileHeader_v2.h"
 #include "bril_histo.h"
 #include "controls.h"
 #include "format.h"

src/wzdma/wz-xdma-ioctl.h

+#ifndef WZ_XDMA_IOCTL_H
+#define WZ_XDMA_IOCTL_H 1
+
 #include <sys/types.h>
 #include <unistd.h>
-#include <wz-xdma-consts.h>
-
+#include "wz-xdma-consts.h"
 #include "stdint.h"
-#ifndef WZ_XDMA_IOCTL_H
-#define WZ_XDMA_IOCTL_H 1
+
 // Structures used to notify the application about the received block of data
 // The block always starts at the first descriptor, and may and in the middle
 // of the last descriptor. Hence the structure describing the block consists

src/wz_dma.h → src/wzdma/wz_dma.h

@@ -2,7 +2,7 @@
 #define WZ_XDMA_H
 
 #include "stdint.h"
-#include "wzdma/xdma-ioctl.h"
+#include "xdma-ioctl.h"
 #define TOT_BUF_LEN ((int64_t)WZ_DMA_BUFLEN * (int64_t)WZ_DMA_NOFBUFS)
 
 struct wz_private {

src/wzdma/xdma-ioctl.h

@@ -6,7 +6,7 @@
 // TODO: Windows build support
 #include <linux/ioctl.h>
 #endif
-#include <wz-xdma-ioctl.h>
+#include "wz-xdma-ioctl.h"
 /* Use 'x' as magic number */
 #define XDMA_IOC_MAGIC 'x'
 /* XL OpenCL X->58(ASCII), L->6C(ASCII), O->0 C->C L->6C(ASCII); */