Change directory structure

PAM/ssh/CMakeLists.txt

@@ -1,9 +1,25 @@
 add_subdirectory(extern/rapidjson)
+include_directories(extern/rapidjson/include)
 
-include_directories(
-    extern/rapidjson/include
+add_library(rublon-ssh
+    INTERFACE
+        include/rublon/pam.hpp
+        include/rublon/rublon.hpp
+        include/rublon/curl.hpp
+        include/rublon/span.hpp
+        include/rublon/sign.hpp
+        include/rublon/CoreHandler.hpp
+        include/rublon/configuration.hpp
 )
 
-add_subdirectory(src)
+#set(CMAKE_SHARED_LINKER_FLAGS "-fpic -static-libstdc++ -fvisibility=hidden -ffunction-sections -fdata-sections -fwhole-program")
 
+target_include_directories(rublon-ssh
+    PUBLIC INTERFACE
+        extern
+        ${CMAKE_CURRENT_LIST_DIR}/include
+)
+
+
+add_subdirectory(lib)
 add_subdirectory(tests)

PAM/ssh/include/rublon/method/method_factory.hpp

@@ -4,9 +4,9 @@
 
 #include <variant>
 
-#include <CoreHandler.hpp>
-#include <pam_action.hpp>
-#include <pam.hpp>
+#include <rublon/CoreHandler.hpp>
+#include <rublon/pam_action.hpp>
+#include <rublon/pam.hpp>
 
 #include "OTP.hpp"
 #include "SMS.hpp"

PAM/ssh/lib/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_library(rublon-ssh-pam
+    SHARED
+        pam.cpp
+)
+
+target_link_options(rublon-ssh-pam
+    PUBLIC
+        -fpic -shared
+)
+
+target_link_libraries(rublon-ssh-pam
+    PUBLIC
+        -lcurl -lssl -lcrypto rublon-ssh
+)

PAM/ssh/lib/pam.cpp

@@ -6,8 +6,8 @@
 
 #include <rapidjson/rapidjson.h>
 
-#include "rublon.hpp"
-#include "utils.hpp"
+#include <rublon/rublon.hpp>
+#include <rublon/utils.hpp>
 
 using namespace std;
 

PAM/ssh/src/CMakeLists.txt

@@ -1,33 +0,0 @@
-add_library(rublon-ssh
-    INTERFACE
-        pam.hpp
-        rublon.hpp
-        curl.hpp
-        span.hpp
-        sign.hpp
-        CoreHandler.hpp
-        configuration.hpp
-)
-
-#set(CMAKE_SHARED_LINKER_FLAGS "-fpic -static-libstdc++ -fvisibility=hidden -ffunction-sections -fdata-sections -fwhole-program")
-
-target_include_directories(rublon-ssh
-    PUBLIC INTERFACE
-        ../extern
-        ${CMAKE_CURRENT_LIST_DIR}
-)
-
-add_library(rublon-ssh-pam
-    SHARED
-        pam.cpp
-)
-
-target_link_options(rublon-ssh-pam
-    PUBLIC
-        -fpic -shared
-)
-
-target_link_libraries(rublon-ssh-pam
-    PUBLIC
-        -lcurl -lssl -lcrypto rublon-ssh
-)

PAM/ssh/tests/core_handler_tests.cpp

@@ -4,7 +4,7 @@
 #include <numeric>
 #include <set>
 
-#include <CoreHandler.hpp>
+#include <rublon/CoreHandler.hpp>
 #include "http_mock.hpp"
 
 class CoreHandlerTestable : public rublon::CoreHandler< HttpHandlerMock > {

PAM/ssh/tests/http_mock.hpp

@@ -5,8 +5,8 @@
 #include <set>
 #include <string>
 
-#include "../src/curl.hpp"
-#include "../src/configuration.hpp"
+#include <rublon/curl.hpp>
+#include <rublon/configuration.hpp>
 
 #include "core_response_generator.hpp"
 

PAM/ssh/tests/init_test.cpp

@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "../src/rublon.hpp"
+#include <rublon/rublon.hpp>
 
 #include "core_response_generator.hpp"
 

PAM/ssh/tests/rublonTests.cpp

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "../src/rublon.hpp"
+#include <rublon/rublon.hpp>
 
 using namespace testing;
 

PAM/ssh/tests/utilsTests.cpp

@@ -4,7 +4,7 @@
 #include <memory_resource>
 #include <string>
 
-#include "../src/utils.hpp"
+#include <rublon/utils.hpp>
 
 using namespace rublon;
 using namespace testing;