Do habitat-cpp-uploader directories properly

habitat-cpp-connector

@@ -1 +1 @@
-Subproject commit 8a2e0891ad5b971bdcf594a34373ad342ee58706
+Subproject commit 64c18110fda18065390e4937a633aef9c63ce271

src/habitat

@@ -1 +1 @@
-../../habitat-cpp-connector/src/
+../habitat-cpp-connector/src/

src/include/habitat

@@ -0,0 +1 @@
+../../habitat-cpp-connector/habitat/

src/include/habitat/CouchDB.h

@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/CouchDB.h

src/include/habitat/EZ.h

@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/EZ.h

src/include/habitat/Extractor.h

@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/Extractor.h

src/include/habitat/README

@@ -1,6 +0,0 @@
-Note: In order to build habitat-cpp-connector directly into fldigi, the
-includes are both here (so that they are are available to dl-fldigi as
-#include "habitat/*.h"), and in dl-fldigi/src/habitat/ via the symlink to
-habitat-cpp-connector/src/ (since when the habitat-cpp-connector cpp files
-themselves are compiled they expect the headers to be available in the same
-directory).

src/include/habitat/UKHASExtractor.h

@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/UKHASExtractor.h

src/include/habitat/Uploader.h

@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/Uploader.h

src/include/habitat/UploaderThread.h

@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/UploaderThread.h