Add Appcore Watch library in Makefile.am

- Added APPCORE_WATCH_CFLAGS and APPCORE_WATCH_LIBS to WEARABLE_PROFILE
  in Makefile.am

Change-Id: I41a5fb8ceb7d13fb39e7d5f554444c5bbc512437
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/adaptors/wearable/watch/watch-time.cpp b/adaptors/wearable/watch/watch-time.cpp
index df7b0f44a260c2fd31ccb60d00d17bbcc4029a82..94377ade4679444c7b72b45720527f35cf3187c1 100644 (file)
--- a/adaptors/wearable/watch/watch-time.cpp
+++ b/adaptors/wearable/watch/watch-time.cpp
@@ -20,8 +20,8 @@
 
 // EXTERNAL INCLUDES
 #ifdef APPCORE_WATCH_AVAILABLE
-#include <appcore-watch/watch_app.h>
-#include <appcore-watch/watch_app_extension.h>
+#include <watch_app.h>
+#include <watch_app_extension.h>
 #endif
 
 namespace Dali

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index e0319e90aa5b13d7f4897f03d86cb3ef670329f8..47410c0104177ff99ce66163a9329bcc091054a9 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -427,7 +427,6 @@ libdali_adaptor_la_LIBADD = \
                       $(HARFBUZZ_LIBS) \
                       $(TPKP_CURL_LIBS) \
                       $(UTILX_LIBS) \
-                      $(APPCORE_WATCH_LIBS) \
                       -lgif \
                       -lpthread \
                       -lturbojpeg \
@@ -496,6 +495,10 @@ if WEARABLE_PROFILE
 libdali_adaptor_la_CXXFLAGS += \
                       $(HAPTIC_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS)
+                      $(APPCORE_WATCH_CFLAGS)
+
+libdali_adaptor_la_LIBADD += \
+                      $(APPCORE_WATCH_LIBS)
 endif
 
 if TV_PROFILE