Updated Makefiles to support different profiles.

Change-Id: Iff4731aec5c3e3f660be58229a398f69be8dcc78
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/adaptors/tizen/internal/common/events/event-handler.cpp b/adaptors/tizen/internal/common/events/event-handler.cpp
index fa9ddbf..329d6fb 100644 (file)
--- a/adaptors/tizen/internal/common/events/event-handler.cpp
+++ b/adaptors/tizen/internal/common/events/event-handler.cpp
@@ -259,7 +259,9 @@ struct EventHandler::Impl
       // Register Vconf notify - font name, font size and style
       vconf_notify_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, handler );
       vconf_notify_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, handler );
+#if defined(DALI_PROFILE_MOBILE)
       vconf_notify_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, VconfNotifyThemeChanged, handler );
+#endif
     }
   }
 
@@ -268,7 +270,9 @@ struct EventHandler::Impl
    */
   ~Impl()
   {
+#if defined(DALI_PROFILE_MOBILE)
     vconf_ignore_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, VconfNotifyThemeChanged );
+#endif
     vconf_ignore_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged );
     vconf_ignore_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged );
 

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index ddce453..591a569 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -14,7 +14,11 @@
 # limitations under the License.
 #
 
-SUBDIRS = common dali-adaptor dali-application plugins
+SUBDIRS = common dali-adaptor dali-application
+
+if ! LITE_PROFILE
+SUBDIRS += plugins
+endif
 
 if MOBILE_PROFILE
 SUBDIRS += dali-evas dali-native-buffer

diff --git a/build/tizen/common/Makefile.am b/build/tizen/common/Makefile.am
index d1b535a..ef752d8 100644 (file)
--- a/build/tizen/common/Makefile.am
+++ b/build/tizen/common/Makefile.am
@@ -38,6 +38,16 @@ slp_platform_abstraction_src_files += $(slp_assimp_src_files)
 include ../../../adaptors/tizen/internal/mobile/file.list
 endif
 
+if LITE_PROFILE
+tizen_adaptor_internal_common_src_files += $(tizen_adaptor_internal_common_profile_src_files)
+slp_platform_abstraction_src_files += $(slp_assimp_stubs_src_files)
+endif
+
+if WEARABLE_PROFILE
+tizen_adaptor_internal_common_src_files += $(tizen_adaptor_internal_common_profile_src_files)
+slp_platform_abstraction_src_files += $(slp_assimp_stubs_src_files)
+endif
+
 if TV_PROFILE
 slp_platform_abstraction_src_files += $(slp_assimp_src_files)
 include ../../../adaptors/tizen/internal/tv/file.list
@@ -51,12 +61,14 @@ include ../../../adaptors/tizen/public-api/file.list
 capi_src_dir = ../../../capi/dali/public-api
 include ../../../capi/dali/public-api/file.list
 
-# Plugins
+# Feedback Plugin
+if ! LITE_PROFILE
 plugin_themes_dir = ../../../adaptors/tizen/internal/common/feedback
 dali_plugin_theme_files = $(plugin_themes_dir)/default-feedback-theme.json
 
 dalifeedbackthemedir = ${dataReadOnlyDir}/themes/feedback-themes/
 dalifeedbacktheme_DATA = ${dali_plugin_theme_files}
+endif
 
 if TURBO_JPEG_IS_ON
   slp_platform_abstraction_src_files += $(slp_platform_abstraction_src_dir)/resource-loader/loader-jpeg-turbo.cpp
@@ -149,6 +161,10 @@ libdali_adaptor_common_la_LIBADD = \
                       -lgif \
                       -lboost_thread
 
+if COMMON_PROFILE
+libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS)
+endif
+
 if MOBILE_PROFILE
 libdali_adaptor_common_la_CXXFLAGS += $(ASSIMP_CFLAGS) \
                       $(DEVICED_CFLAGS) \
@@ -162,6 +178,14 @@ libdali_adaptor_common_la_LIBADD += $(ASSIMP_LIBS) \
                       $(NATIVE_BUFFER_POOL_LIBS)
 endif
 
+if LITE_PROFILE
+libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS)
+endif
+
+if WEARABLE_PROFILE
+libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS)
+endif
+
 if TV_PROFILE
 libdali_adaptor_common_la_CXXFLAGS += $(ASSIMP_CFLAGS) \
                                       $(HAPTIC_CFLAGS)
@@ -169,10 +193,6 @@ libdali_adaptor_common_la_CXXFLAGS += $(ASSIMP_CFLAGS) \
 libdali_adaptor_common_la_LIBADD += $(ASSIMP_LIBS)
 endif
 
-if COMMON_PROFILE
-libdali_adaptor_common_la_CXXFLAGS += $(HAPTIC_CFLAGS)
-endif
-
 if TURBO_JPEG_IS_ON
 libdali_adaptor_common_la_LIBADD += -lturbojpeg
 CFLAGS += -D_TURBO_JPEG_LOADER

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 466594f..74a5725 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -110,7 +110,7 @@ AM_CONDITIONAL(TURBO_JPEG_IS_ON, test $with_jpeg_turbo = yes)
 
 # Tizen Profile options
 AC_ARG_ENABLE([profile],
-              [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,TV],
+              [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,LITE,WEARABLE,TV],
                             [Select the variant of tizen])],
               [dali_profile=$enableval],
               [dali_profile=COMMON])
@@ -126,8 +126,15 @@ DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_PROFILE_${dali_profile}"
 DALI_PROFILE_CFLAGS=" -DDALI_PROFILE_${dali_profile}"
 AM_CONDITIONAL([COMMON_PROFILE], [test x$dali_profile = xCOMMON])
 AM_CONDITIONAL([MOBILE_PROFILE], [test x$dali_profile = xMOBILE])
+AM_CONDITIONAL([LITE_PROFILE], [test x$dali_profile = xLITE])
+AM_CONDITIONAL([WEARABLE_PROFILE], [test x$dali_profile = xWEARABLE])
 AM_CONDITIONAL([TV_PROFILE], [test x$dali_profile = xTV])
 
+if test "x$enable_profile" = "xCOMMON"; then
+PKG_CHECK_MODULES(OPENGLES20, gles20)
+PKG_CHECK_MODULES(HAPTIC, haptic)
+fi
+
 if test "x$enable_profile" = "xMOBILE"; then
 PKG_CHECK_MODULES(OPENGLES20, opengl-es-20)
 PKG_CHECK_MODULES(ASSIMP, assimp)
@@ -137,14 +144,17 @@ PKG_CHECK_MODULES(NATIVE_BUFFER, native-buffer)
 PKG_CHECK_MODULES(NATIVE_BUFFER_POOL, native-buffer-pool)
 fi
 
-if test "x$enable_profile" = "xTV"; then
+if test "x$enable_profile" = "xLITE"; then
 PKG_CHECK_MODULES(OPENGLES20, gles20)
-PKG_CHECK_MODULES(ASSIMP, assimp)
-PKG_CHECK_MODULES(HAPTIC, haptic)
 fi
 
-if test "x$enable_profile" = "xCOMMON"; then
+if test "x$enable_profile" = "xWEARABLE"; then
+PKG_CHECK_MODULES(OPENGLES20, gles20)
+fi
+
+if test "x$enable_profile" = "xTV"; then
 PKG_CHECK_MODULES(OPENGLES20, gles20)
+PKG_CHECK_MODULES(ASSIMP, assimp)
 PKG_CHECK_MODULES(HAPTIC, haptic)
 fi
 
@@ -196,7 +206,6 @@ AC_SUBST(DALI_PROFILE_CFLAGS)
 devincludepath=${includedir}
 AC_SUBST(devincludepath)
 
-
 AC_CONFIG_FILES([
  Makefile
  common/Makefile
@@ -204,15 +213,21 @@ AC_CONFIG_FILES([
  dali.pc
  dali-application/Makefile
  dali-application.pc
+])
+
+if test "x$enable_profile" != "xLITE"; then
+AC_CONFIG_FILES([
  dali-evas/Makefile
  dali-evas.pc
  dali-native-buffer/Makefile
  dali-native-buffer.pc
  plugins/Makefile
 ])
+fi
 
 AC_OUTPUT
 
+
 echo "
 Configuration
 -------------

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 4cc0f5d..de3041b 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -36,6 +36,7 @@ BuildRequires:  libdrm-devel
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(gles20)
+BuildRequires:  pkgconfig(efl-assist)
 BuildRequires:  pkgconfig(libpng)
 
 %description