From 724c61a22ce392b62aed1c7d4ff15fe53e582d09 Mon Sep 17 00:00:00 2001 From: Daekwang Ryu Date: Mon, 23 Jul 2018 14:43:11 +0900 Subject: [PATCH] Revert "[Tizen] Build watch.cpp only on wearable profile" This reverts commit 3dfc2f75064ff9fd01f70128fc6a91f6a7005e11. --- configure.ac | 8 -------- dali-csharp-binder/Makefile.am | 6 +----- dali-csharp-binder/file.list | 4 ++-- packaging/dali-csharp-binder.spec | 4 ---- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 90744ce..7e7d29c 100755 --- a/configure.ac +++ b/configure.ac @@ -23,16 +23,8 @@ AC_ARG_ENABLE(ecoreWl2, enable_ecoreWl2=yes, enable_ecoreWl2=no) -# Tizen Profile options -AC_ARG_ENABLE([profile], - [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,IVI,UBUNTU], - [Select the variant of tizen])], - [enable_profile=$enableval], - [enable_profile=UBUNTU]) - AM_CONDITIONAL([TIZENBUILD], [test x$enable_tizenBuild = xyes]) AM_CONDITIONAL([ECOREWL2], [test x$enable_ecoreWl2 = xyes]) -AM_CONDITIONAL([WEARABLE_PROFILE], [test x$enable_profile = xWEARABLE]) PKG_PROG_PKG_CONFIG # Checks for libraries. added for widget_viewer_dali binding only for tizen diff --git a/dali-csharp-binder/Makefile.am b/dali-csharp-binder/Makefile.am index 13cd6cc..8a7eb07 100755 --- a/dali-csharp-binder/Makefile.am +++ b/dali-csharp-binder/Makefile.am @@ -29,11 +29,7 @@ else libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files) endif -if WEARABLE_PROFILE -libdali_csharp_binder_la_SOURCES += \ - $(dali_csharp_binder_src_files_watch) -endif - libdali_csharp_binderdir = $(includedir)/dali-csharp-binder libdali_csharp_binder_HEADERS = $(dali_csharp_binder_header_files) + diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list index b429bbd..2abbf77 100755 --- a/dali-csharp-binder/file.list +++ b/dali-csharp-binder/file.list @@ -30,6 +30,7 @@ dali_csharp_binder_src_files = \ src/input-method-context.cpp \ src/input-method-options.cpp \ src/animation.cpp \ + src/watch.cpp \ src/adaptor.cpp \ src/extents.cpp @@ -63,6 +64,7 @@ dali_csharp_binder_src_files_tizen = \ src/input-method-options.cpp \ src/animation.cpp \ src/key-grab.cpp \ + src/watch.cpp \ src/widget_view.cpp \ src/widget_view_manager.cpp \ src/adaptor.cpp \ @@ -73,5 +75,3 @@ dali_csharp_binder_src_files_tizen = \ dali_csharp_binder_header_files = \ src/common.h -dali_csharp_binder_src_files_tizen_watch = \ - src/watch.cpp diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec index 1ff3d8f..8c67c46 100755 --- a/packaging/dali-csharp-binder.spec +++ b/packaging/dali-csharp-binder.spec @@ -50,15 +50,11 @@ This package includes developer files common to all packages. # added for key grab binding only for tizen %if 0%{?tizen_version_major} >= 5 %configure --enable-ecoreWl2=yes \ -%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" - --enable-profile=WEARABLE \ -%endif --enable-tizenBuild=yes %else %configure --enable-tizenBuild=yes %endif - make %{?_smp_mflags} ############################## -- 2.7.4