directory clean up

Author: jvde-github

CMakeLists.txt

@@ -812,7 +812,7 @@ endif()
 
 set(CPP
     Application/Main.cpp Application/Prometheus.cpp Application/WebViewer.cpp Application/Receiver.cpp Application/Config.cpp Tracking/Ships.cpp Tracking/DB.cpp DBMS/PostgreSQL.cpp
-    Device/AIRSPYHF.cpp Device/FileWAV.cpp Device/RTLSDR.cpp Device/SDRPLAY.cpp DSP/Demod.cpp DSP/Model.cpp Library/AIS.cpp JSONAIS/JSONAIS.cpp JSONAIS/Keys.cpp Library/Bluetooth.cpp
+    Device/AIRSPYHF.cpp Device/FileWAV.cpp Device/RTLSDR.cpp Device/SDRPLAY.cpp DSP/Demod.cpp DSP/Model.cpp Library/AIS.cpp JSON/JSONAIS.cpp JSON/Keys.cpp Library/Bluetooth.cpp
     Device/FileRAW.cpp Device/HACKRF.cpp Device/UDP.cpp Device/RTLTCP.cpp Device/ZMQ.cpp Device/SoapySDR.cpp Device/SpyServer.cpp Library/Message.cpp Library/NMEA.cpp
     Library/Utilities.cpp Library/TCP.cpp JSON/JSON.cpp IO/Network.cpp IO/HTTPServer.cpp JSON/StringBuilder.cpp JSON/Parser.cpp Library/Logger.cpp
     Device/AIRSPY.cpp Device/Serial.cpp IO/HTTPClient.cpp Application/WebDB.cpp
@@ -821,11 +821,11 @@ set(CPP
 
 set(HEADER
     Application/AIS-catcher.h Application/Prometheus.h Application/Config.h Application/WebDB.h Library/Logger.h Application/WebViewer.h Application/Receiver.h Tracking/Ships.h Tracking/DB.h DBMS/PostgreSQL.h IO/HTTPClient.h Application/MapTiles.h Library/Beast.h
-    Device/Device.h Device/FileWAV.h Device/RTLTCP.h Device/UDP.h DSP/Demod.h DSP/Filters.h Library/AIS.h Library/Message.h Library/NMEA.h Library/ZIP.h Library/Signals.h Device/SoapySDR.h JSONAIS/JSONAIS.h JSON/JSON.h Library/Basestation.h Library/ADSB.h Library/Bluetooth.h
-    Device/AIRSPY.h Library/FIFO.h Device/N2KsktCAN.h Device/HACKRF.h Device/SDRPLAY.h DSP/DSP.h DSP/Model.h Tracking/History.h Tracking/Statistics.h Library/Common.h Library/Stream.h Device/SpyServer.h JSONAIS/Keys.h JSON/StringBuilder.h JSON/Parser.h Tracking/PlaneDB.h
+    Device/Device.h Device/FileWAV.h Device/RTLTCP.h Device/UDP.h DSP/Demod.h DSP/Filters.h Library/AIS.h Library/Message.h Library/NMEA.h Library/ZIP.h Library/Signals.h Device/SoapySDR.h JSON/JSONAIS.h JSON/JSON.h Library/Basestation.h Library/ADSB.h Library/Bluetooth.h
+    Device/AIRSPY.h Library/FIFO.h Device/N2KsktCAN.h Device/HACKRF.h Device/SDRPLAY.h DSP/DSP.h DSP/Model.h Tracking/History.h Tracking/Statistics.h Library/Common.h Library/Stream.h Device/SpyServer.h JSON/Keys.h JSON/StringBuilder.h JSON/Parser.h Tracking/PlaneDB.h
     Device/Serial.h IO/N2KInterface.h Library/N2K.h IO/N2KStream.h Device/AIRSPYHF.h Device/FileRAW.h Device/RTLSDR.h Device/ZMQ.h DSP/FFT.h IO/MsgOut.h IO/Network.h IO/HTTPServer.h Library/Utilities.h Library/TCP.h Protocol/Protocol.h)
 
-set(APP_INCLUDES . ./Tracking ./DBMS ./Library ./DSP ./Application ./IO ./Protocol ./JSONAIS)
+set(APP_INCLUDES . ./Tracking ./DBMS ./Library ./DSP ./Application ./IO ./Protocol ./JSON)
 
 # Executable
 

JSONAIS/JSONAIS.cpp JSON/JSONAIS.cppJSONAIS/JSONAIS.cpp renamed to JSON/JSONAIS.cpp

@@ -19,7 +19,7 @@
 #include <cmath>
 
 #include "StringBuilder.h"
-#include "../JSONAIS/Keys.h"
+#include "Keys.h"
 
 namespace JSON {
 

JSONAIS/JSONAIS.h JSON/JSONAIS.hJSONAIS/JSONAIS.h renamed to JSON/JSONAIS.h

@@ -1,6 +1,6 @@
-SRC = Tracking/Ships.cpp Library/N2K.cpp IO/N2KInterface.cpp Device/N2KsktCAN.cpp IO/N2KStream.cpp Application/Prometheus.cpp Application/Main.cpp Application/WebViewer.cpp IO/HTTPClient.cpp DBMS/PostgreSQL.cpp Tracking/DB.cpp Application/Config.cpp Application/Receiver.cpp IO/HTTPServer.cpp DSP/DSP.cpp JSONAIS/JSONAIS.cpp JSON/Parser.cpp JSON/StringBuilder.cpp JSONAIS/Keys.cpp Library/AIS.cpp IO/Network.cpp DSP/Model.cpp Library/NMEA.cpp Library/Utilities.cpp DSP/Demod.cpp Library/Message.cpp Device/UDP.cpp Device/ZMQ.cpp Device/RTLSDR.cpp Device/AIRSPYHF.cpp Device/SoapySDR.cpp Device/AIRSPY.cpp Device/FileRAW.cpp Device/FileWAV.cpp Device/SDRPLAY.cpp Device/RTLTCP.cpp Device/HACKRF.cpp Device/Serial.cpp Library/TCP.cpp Device/SpyServer.cpp JSON/JSON.cpp Protocol/Protocol.cpp IO/MsgOut.cpp Library/Logger.cpp Library/Basestation.cpp  Application/WebDB.cpp Library/Beast.cpp Library/ADSB.cpp
+SRC = Tracking/Ships.cpp Library/N2K.cpp IO/N2KInterface.cpp Device/N2KsktCAN.cpp IO/N2KStream.cpp Application/Prometheus.cpp Application/Main.cpp Application/WebViewer.cpp IO/HTTPClient.cpp DBMS/PostgreSQL.cpp Tracking/DB.cpp Application/Config.cpp Application/Receiver.cpp IO/HTTPServer.cpp DSP/DSP.cpp JSON/JSONAIS.cpp JSON/Parser.cpp JSON/StringBuilder.cpp JSON/Keys.cpp Library/AIS.cpp IO/Network.cpp DSP/Model.cpp Library/NMEA.cpp Library/Utilities.cpp DSP/Demod.cpp Library/Message.cpp Device/UDP.cpp Device/ZMQ.cpp Device/RTLSDR.cpp Device/AIRSPYHF.cpp Device/SoapySDR.cpp Device/AIRSPY.cpp Device/FileRAW.cpp Device/FileWAV.cpp Device/SDRPLAY.cpp Device/RTLTCP.cpp Device/HACKRF.cpp Device/Serial.cpp Library/TCP.cpp Device/SpyServer.cpp JSON/JSON.cpp Protocol/Protocol.cpp IO/MsgOut.cpp Library/Logger.cpp Library/Basestation.cpp  Application/WebDB.cpp Library/Beast.cpp Library/ADSB.cpp
 OBJ = Ships.o Main.o N2KStream.o N2K.o N2KInterface.o N2KsktCAN.o Prometheus.o Receiver.o Config.o WebViewer.o HTTPClient.o PostgreSQL.o DB.o DSP.o AIS.o Model.o Utilities.o Network.o Demod.o Serial.o RTLSDR.o HTTPServer.o AIRSPYHF.o Keys.o AIRSPY.o Parser.o StringBuilder.o FileRAW.o FileWAV.o SDRPLAY.o NMEA.o RTLTCP.o HACKRF.o ZMQ.o UDP.o SoapySDR.o TCP.o Message.o SpyServer.o JSON.o JSONAIS.o Protocol.o MsgOut.o Logger.o Basestation.o WebDB.o Beast.o ADSB.o
-INCLUDE = -I. -IJSONAIS/ -IDBMS/ -ITracking/ -ILibrary/ -IDSP/ -IApplication/ -IIO/ -IProtocol/
+INCLUDE = -I. -IJSON/ -IDBMS/ -ITracking/ -ILibrary/ -IDSP/ -IApplication/ -IIO/ -IProtocol/
 CC = clang
 
 override CFLAGS +=  -Ofast -std=c++11 -g -pg -Wno-sign-compare $(INCLUDE)