X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=548eeecdec07e8b6e05f599dc241d3720f95342a;hb=b9c46edbb2fc8e97620e733791a7d96547c37f64;hp=f616072aa577bfb046ee22357085e84425c0c591;hpb=ff348fc39497cad3b0c5a166ba2032c9cb1d28c5;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f616072..548eeec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ADD_SUBDIRECTORY(bt-api)
 
-IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_TEST_EMUL")
-ADD_SUBDIRECTORY(bt-service-emul)
-ELSE()
-ADD_SUBDIRECTORY(bt-service)
+ADD_SUBDIRECTORY(bt-oal)
+ADD_SUBDIRECTORY(bt-service-adaptation)
+
+IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_BT_HTTP_PROXY")
+#ADD_SUBDIRECTORY(bt-httpproxy)
 ENDIF()
 
-ADD_SUBDIRECTORY(bt-httpproxy)
+# TODO_40 : 4.0 merge
+ADD_SUBDIRECTORY(bt-otp)
 
 ADD_SUBDIRECTORY(bt-core)