4 files changed, 81 insertions, 91 deletions
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 933fed1c74c..3495a47f915 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,16 +1,4 @@
-add_subdirectory(Configuration)
-add_subdirectory(Cryptography)
-add_subdirectory(Database)
-add_subdirectory(DataStores)
-add_subdirectory(Debugging)
-add_subdirectory(Dynamic)
-add_subdirectory(Logging)
-add_subdirectory(Packets)
-add_subdirectory(Policies)
-add_subdirectory(Threading)
-add_subdirectory(Utilities)
-
-########### next target ###############
+########### shared ###############
 
 SET(shared_STAT_SRCS
    Debugging/Errors.h
@@ -59,3 +47,83 @@ target_link_libraries(
 shared
 ${ACE_LIBRARY}
 )
+
+
+########### trinityconfig ###############
+
+SET(trinityconfig_STAT_SRCS
+   Configuration/dotconfpp/dotconfpp.cpp
+   Configuration/dotconfpp/dotconfpp.h
+   Configuration/dotconfpp/mempool.cpp
+   Configuration/dotconfpp/mempool.h
+   Configuration/Config.cpp
+   Configuration/Config.h
+   Configuration/ConfigEnv.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+)
+
+add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
+
+########### trinityauth ###############
+
+SET(trinityauth_STAT_SRCS
+   Cryptography/Authentication/AuthCrypt.cpp
+   Cryptography/Authentication/AuthCrypt.h
+   Cryptography/BigNumber.cpp
+   Cryptography/BigNumber.h
+   Cryptography/HMACSHA1.cpp
+   Cryptography/HMACSHA1.h
+   Cryptography/SHA1.cpp
+   Cryptography/SHA1.h
+   Cryptography/MD5.c
+   Cryptography/MD5.h
+   Cryptography/ARC4.cpp
+   Cryptography/ARC4.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${MYSQL_INCLUDE_DIR}
+)
+
+add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
+
+########### trinitydatabase ###############
+
+SET(trinitydatabase_STAT_SRCS
+    DataStores/DBCFileLoader.cpp
+    DataStores/DBCFileLoader.h
+    DataStores/DBCStore.h
+    Database/Database.cpp
+    Database/Database.h
+    Database/DatabaseEnv.h
+    Database/DatabaseImpl.h
+    Database/Field.cpp
+    Database/Field.h
+    Database/QueryResult.cpp
+    Database/QueryResult.h
+    Database/SQLStorage.cpp
+    Database/SQLStorage.h
+    Database/SqlDelayThread.cpp
+    Database/SqlDelayThread.h
+    Database/SqlOperations.cpp
+    Database/SqlOperations.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${MYSQL_INCLUDE_DIR}
+)
+
+add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
+\ No newline at end of file
diff --git a/src/server/shared/Configuration/CMakeLists.txt b/src/server/shared/Configuration/CMakeLists.txt
deleted file mode 100644
index da1c2e8aa3b..00000000000
--- a/src/server/shared/Configuration/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-########### next target ###############
-
-SET(trinityconfig_STAT_SRCS
-   dotconfpp/dotconfpp.cpp
-   dotconfpp/dotconfpp.h
-   dotconfpp/mempool.cpp
-   dotconfpp/mempool.h
-   Config.cpp
-   Config.h
-   ConfigEnv.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
-)
-
-add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
-
diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt
deleted file mode 100644
index cdd9ece3fa0..00000000000
--- a/src/server/shared/Cryptography/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-########### next target ###############
-
-SET(trinityauth_STAT_SRCS
-   Authentication/AuthCrypt.cpp
-   Authentication/AuthCrypt.h
-   BigNumber.cpp
-   BigNumber.h
-   HMACSHA1.cpp
-   HMACSHA1.h
-   SHA1.cpp
-   SHA1.h
-   MD5.c
-   MD5.h
-   ARC4.cpp
-   ARC4.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
deleted file mode 100644
index cfe36b8c7d3..00000000000
--- a/src/server/shared/Database/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-SET(trinitydatabase_STAT_SRCS
-    ../DataStores/DBCFileLoader.cpp
-    ../DataStores/DBCFileLoader.h
-    ../DataStores/DBCStore.h
-    Database.cpp
-    Database.h
-    DatabaseEnv.h   
-    DatabaseImpl.h
-    Field.cpp
-    Field.h
-    QueryResult.cpp
-    QueryResult.h
-    SQLStorage.cpp
-    SQLStorage.h
-    SqlDelayThread.cpp
-    SqlDelayThread.h
-    SqlOperations.cpp
-    SqlOperations.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})