From 141098e43439f6502a50e635240778b098f4d24c Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 23 Oct 2015 10:47:48 +0200
Subject: [PATCH] Improve header files handling in CMake.

---
 coreapi/CMakeLists.txt | 5 ++---
 mediastreamer2         | 2 +-
 oRTP                   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 105a4a6cf..238db5bd4 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -51,7 +51,6 @@ set(LINPHONE_HEADER_FILES
 )
 
 set(LINPHONE_SOURCE_FILES
-	${LINPHONE_HEADER_FILES}
 	account_creator.c
 	address.c
 	authentication.c
@@ -162,10 +161,10 @@ if(INTL_FOUND)
 endif()
 
 if(ENABLE_STATIC)
-	add_library(linphone STATIC ${LINPHONE_SOURCE_FILES})
+	add_library(linphone STATIC ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES})
 	target_link_libraries(linphone ${LIBS})
 else()
-	add_library(linphone SHARED ${LINPHONE_SOURCE_FILES})
+	add_library(linphone SHARED ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES})
 	set_target_properties(linphone PROPERTIES VERSION ${LINPHONE_SO_VERSION} LINKER_LANGUAGE CXX)
 	target_link_libraries(linphone ${LIBS})
 	if(MSVC)
diff --git a/mediastreamer2 b/mediastreamer2
index 03869fcba..d6c107053 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 03869fcbacdf65c08e7b034188054d69bfc5648f
+Subproject commit d6c107053b8dc55c754e2f01155d447adad60151
diff --git a/oRTP b/oRTP
index 133ed70f7..9a1e61aba 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 133ed70f7b45bf972ab5be9593f68b7c15a3a3b2
+Subproject commit 9a1e61aba3aad49fdc047aa21956ee07037f96b0