Merge branch 'master' into simulator

[platform/upstream/iotivity.git] / service / SConscript

diff --git a/service/SConscript b/service/SConscript
index cfd6f83..d6d8a5b 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -1,13 +1,32 @@
+#******************************************************************
+#
+# Copyright 2014 Samsung Electronics All Rights Reserved.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# 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.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 ##
 # 'service' sub-project main build script
 #
 ##
 Import('env')
-Import('targets_csdk_only')
 
 target_os = env.get('TARGET_OS')
 
-if target_os not in targets_csdk_only:
+if target_os not in ['arduino','darwin','ios']:
        # Build things manager project
        SConscript('things-manager/SConscript')
 
@@ -20,6 +39,16 @@ if target_os not in targets_csdk_only:
                SConscript('protocol-plugin/SConscript')
 
        # Build notification manager project
-#      SConscript('notification-manager/SConscript')
+       if target_os not in ['android', 'tizen']:
+               SConscript('notification-manager/SConscript')
+
+       # Build resource-encapsulation project
+       SConscript('resource-encapsulation/SConscript')
+
+       # Build simulator module
+       if target_os in ['linux']:
+               SConscript('simulator/SConscript')
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
+
+