X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=21880373f1e0eba3ced30bf14ec0c9e5a6cca213;hb=1ff77faf14c604cf3354396e5c7f330d06d7b826;hp=6346edec435569e25119b1073cebb860741440c6;hpb=861dad837cc93bd01fc967ead93eda73faa46408;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6346ede..2188037 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,18 @@ 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-oal)
 ADD_SUBDIRECTORY(bt-service)
+
+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)
 
+ADD_SUBDIRECTORY(plugin)
+
 ADD_SUBDIRECTORY(test)