remove build warning: Two different environments..
authorch79.cho <ch79.cho@samsung.com>
Wed, 7 Sep 2016 04:42:21 +0000 (13:42 +0900)
committerUze Choi <uzchoi@samsung.com>
Wed, 7 Sep 2016 06:31:50 +0000 (06:31 +0000)
Scons warning is removed:
"Two different environments were specified for target"

Change-Id: Iba5dc62b891bb12712e4f049545008bef00b5a7a
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11475
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
service/notification/examples/linux/SConscript

index 15b2f37..790caca 100644 (file)
@@ -49,10 +49,15 @@ if env.get('WITH_CLOUD') == True:
         notification_sample_env.AppendUnique(CPPPATH = ['../../src/provider'])
        notification_sample_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])
 
-       CONSUMER_CLOUD = File('cloud_connector.c')
-       notification_sample_consumer_src = ['notificationconsumer.c', CONSUMER_CLOUD]
-        PROVIDER_CLOUD = File('cloud_connector.c')
-        notification_sample_provider_src = ['notificationprovider.c', PROVIDER_CLOUD]
+        providerCloudConnectorObj = notification_sample_env.Object('cloud_connector.c')
+        consumerCloudConnectorObj = notification_sample_env.Object('cloud_connector.c')
+
+        #PROVIDER_CLOUD = File('cloud_connector.c')
+        #notification_sample_provider_src = ['notificationprovider.c', PROVIDER_CLOUD]
+        notification_sample_provider_src = ['notificationprovider.c', providerCloudConnectorObj]
+       #CONSUMER_CLOUD = File('cloud_connector.c')
+       #notification_sample_consumer_src = ['notificationconsumer.c', CONSUMER_CLOUD]
+        notification_sample_consumer_src = ['notificationconsumer.c', consumerCloudConnectorObj]
 
 if env.get('WITH_TCP') == True:
        notification_sample_env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
@@ -71,3 +76,7 @@ notification_sample_consumer_env = notification_sample_env.Clone()
 notification_sample_consumer_env.AppendUnique(LIBS = 'libnotification_consumer')
 notificationconsumer = notification_sample_consumer_env.Program('notificationconsumer', notification_sample_consumer_src)
 i_notificationprovider = notification_sample_consumer_env.Install(env.get('BUILD_DIR'), notificationconsumer)
+
+if env.get('WITH_CLOUD') == True:
+        Export('providerCloudConnectorObj')
+        Export('consumerCloudConnectorObj')