ADD_SUBDIRECTORY(bt-api)
-ADD_SUBDIRECTORY(bt-service)
+ADD_SUBDIRECTORY(bt-oal)
+ADD_SUBDIRECTORY(bt-service-adaptation)
+
+# TODO_40 : 4.0 merge
+ADD_SUBDIRECTORY(bt-httpproxy)
+
+# TODO_40 : 4.0 merge
+ADD_SUBDIRECTORY(bt-otp)
ADD_SUBDIRECTORY(bt-core)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(plugin)
+
+ADD_SUBDIRECTORY(test)