libfreerdp: move all libraries to libfreerdp directory, one step closer to monolithic build option

CMakeLists.txt

@@ -176,7 +176,7 @@ set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp
 set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp/extensions")
 
 # Include directories
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
 # Configure files
@@ -198,19 +198,12 @@ if(WITH_CUNIT)
 endif()
 
 # Sub-directories
+
 add_subdirectory(include)
-add_subdirectory(libfreerdp-utils)
 
 add_subdirectory(winpr)
 
-add_subdirectory(libfreerdp-gdi)
-add_subdirectory(libfreerdp-rail)
-add_subdirectory(libfreerdp-cache)
-add_subdirectory(libfreerdp-codec)
-add_subdirectory(libfreerdp-crypto)
-add_subdirectory(libfreerdp-channels)
-add_subdirectory(libfreerdp-locale)
-add_subdirectory(libfreerdp-core)
+add_subdirectory(libfreerdp)
 
 if(WITH_CHANNELS)
 	add_subdirectory(channels)

libfreerdp/CMakeLists.txt

@@ -0,0 +1,28 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# libfreerdp cmake build script
+#
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_subdirectory(utils)
+add_subdirectory(gdi)
+add_subdirectory(rail)
+add_subdirectory(cache)
+add_subdirectory(codec)
+add_subdirectory(crypto)
+add_subdirectory(channels)
+add_subdirectory(locale)
+add_subdirectory(core)
+
+