Fixed build error

Change-Id: Ibb0e7d396ce7604212225c860531e2ab28729635

diff --git a/.gitignore b/.gitignore
index 152a4e0..7aac095 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 .svace-dir
 .sign
 .sdk_delta.info
+.package-stamp
+tags

diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 38e5598..8485bb2 100644 (file)
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -58,9 +58,9 @@ ifneq ($$(strip $$(_ALL_SRCS)),)
 
 _ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) 
 
-_COMPILER_FLAGS := -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images"
-_COMPILER_FLAGS += -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds"
-_COMPILER_FLAGS += -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts"
+_COMPILER_FLAGS := -id "$$(_OUTPUT_DIR)" -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images"
+_COMPILER_FLAGS += -sd "$$(_OUTPUT_DIR)" -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds"
+_COMPILER_FLAGS += -fd "$$(_OUTPUT_DIR)" -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts"
 
 ifneq ($$(strip $$(_IMAGE_DIRS)),)
 _COMPILER_FLAGS += $$(addprefix -id ,$$(_IMAGE_DIRS))

diff --git a/Build/makefile.mk b/Build/makefile.mk
index b07df26..7384d24 100644 (file)
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -2,7 +2,7 @@
 # Usege : make -f <proj_root>/Build/makefile -C <proj_root> 
 #
  
-BUILD_SCRIPT_VERSION := 1.2.0
+BUILD_SCRIPT_VERSION := 1.2.2
 
 .PHONY : app_version app_clean build_version
 
@@ -63,7 +63,7 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(C_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
 CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
@@ -85,7 +85,7 @@ endif
 
 ifneq ($(strip $(USER_LIB_DIRS)),)
 _ENC_USER_LIB_DIRS := $(call ENCODE_4MAKE,$(USER_LIB_DIRS))
-_ENC_USER_LIB_DIRS := $(addprefix -L,$(call $(_ENC_USER_LIB_DIRS))
+_ENC_USER_LIB_DIRS := $(addprefix -L,$(_ENC_USER_LIB_DIRS))
 LIBPATHS := $(call DECODE_4MAKE,$(_ENC_USER_LIB_DIRS))
 endif
 

diff --git a/project_def.prop b/project_def.prop
index 4ea0ad1..cfbf120 100755 (executable)
--- a/project_def.prop
+++ b/project_def.prop
@@ -8,67 +8,56 @@ type = app
 # Project Profile
 profile = mobile-3.0
 
-# C Sources
-USER_SRCS = src/apps_data.c src/homescreen-efl.c src/popup.c src/cluster_page.c src/cluster_db.c src/cluster_view.c src/widget_viewer.c src/page_indicator.c src/cluster_data.c src/conf.c src/add_widget_viewer/add_widget_data.c src/apps_view.c src/menu.c src/hw_key.c src/add_widget_viewer/add_widget_viewer.c src/apps_db.c src/apps_package_manager.c src/util.c 
-USER_SRCS_ABS = 
+# C/CPP Sources
+USER_SRCS = src/apps_data.c src/apps_view.c src/menu.c src/homescreen-efl.c src/hw_key.c src/popup.c src/cluster_page.c src/cluster_db.c src/cluster_view.c src/add_widget_viewer/add_widget_viewer.c src/widget_viewer.c src/apps_db.c src/page_indicator.c src/cluster_data.c src/apps_package_manager.c src/util.c src/add_widget_viewer/add_widget_data.c src/conf.c
 
 # EDC Sources
-USER_EDCS =  
+USER_EDCS =
 
 # PO Sources
-USER_POS = res/po/pt_BR.po res/po/ro.po res/po/ko_KR.po res/po/ka.po res/po/is.po res/po/ru_RU.po res/po/en_PH.po res/po/it_IT.po res/po/el_GR.po res/po/uk.po res/po/hr.po res/po/az.po res/po/zh_CN.po res/po/es_US.po res/po/kk.po res/po/eu.po res/po/et.po res/po/lv.po res/po/hy.po res/po/ga.po res/po/ja_JP.po res/po/bg.po res/po/es_ES.po res/po/pt_PT.po res/po/pl.po res/po/hu.po res/po/en_US.po res/po/da.po res/po/tr_TR.po res/po/uz.po res/po/sv.po res/po/sk.po res/po/nl.po res/po/fr.po res/po/ca.po res/po/nb.po res/po/mk.po res/po/lt.po res/po/zh_TW.po res/po/de.po res/po/sl.po res/po/fr_CA.po res/po/gl.po res/po/sr.po res/po/cs.po res/po/ar.po res/po/fi.po res/po/hi.po res/po/en.po res/po/zh_HK.po 
+USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po
 
 # User Defines
-USER_DEFS = 
-USER_CPP_DEFS = 
+USER_DEFS =
+USER_CPP_DEFS =
 
 # User Undefines
-USER_UNDEFS = 
-USER_CPP_UNDEFS = 
+USER_UNDEFS =
+USER_CPP_UNDEFS =
 
 # User Libraries
-USER_LIBS = 
+USER_LIBS =
 
 # User Objects
-USER_OBJS = 
-USER_OBJS_ABS = 
+USER_OBJS =
 
 # User Includes
 ## C Compiler
-USER_INC_DIRS = inc 
-USER_INC_DIRS_ABS = 
-USER_INC_FILES = 
-USER_INC_FILES_ABS = 
+USER_C_INC_DIRS = inc
+USER_INC_FILES =
 ## C++ Compiler
-USER_CPP_INC_DIRS = 
-USER_CPP_INC_DIRS_ABS = 
-USER_CPP_INC_FILES = 
-USER_CPP_INC_FILES_ABS = 
+USER_CPP_INC_DIRS =
+USER_CPP_INC_FILES =
+
+USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
 
 # User Library Path
-USER_LIB_DIRS = 
-USER_LIB_DIRS_ABS = 
+USER_LIB_DIRS =
 
 # EDC Resource Path
-USER_EDCS_IMAGE_DIRS = edje/images 
-USER_EDCS_IMAGE_DIRS_ABS = 
-USER_EDCS_SOUND_DIRS = edje/sounds 
-USER_EDCS_SOUND_DIRS_ABS = 
-USER_EDCS_FONT_DIRS = edje/fonts 
-USER_EDCS_FONT_DIRS_ABS = 
+USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images
+USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds
+USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 
 # EDC Flags
-USER_EXT_EDC_KEYS = EDC0 
+USER_EXT_EDC_KEYS = EDC0
 
-USER_EXT_EDC0_EDCS = res/edje/widget.edc res/edje/apps_folder_icon.edc res/edje/apps_folder_popup.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/apps_chooser_btn.edc res/edje/add_widget_viewer.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/cluster_allpage.edc 
-USER_EXT_EDC0_EDCS_IMAGE_DIRS = edje/images res/images
-USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = 
-USER_EXT_EDC0_EDCS_SOUND_DIRS = edje/sounds 
-USER_EXT_EDC0_EDCS_SOUND_DIRS_ABS = 
-USER_EXT_EDC0_EDCS_FONT_DIRS = edje/fonts 
-USER_EXT_EDC0_EDCS_FONT_DIRS_ABS = 
+USER_EXT_EDC0_EDCS = res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/widget.edc res/edje/add_widget_viewer.edc res/edje/apps_folder_icon.edc res/edje/apps_chooser_btn.edc res/edje/apps_folder_popup.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage.edc
+USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images
+USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds
+USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 
 # Resource Filter
-USER_RES_INCLUDE = 
-USER_RES_EXCLUDE = 
+USER_RES_INCLUDE =
+USER_RES_EXCLUDE =
 

diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c
index 331a51d..e7b953d 100755 (executable)
--- a/src/apps_package_manager.c
+++ b/src/apps_package_manager.c
@@ -30,6 +30,7 @@ static bool __apps_package_manager_get_item(app_info_h app_handle, void *data);
 static void __apps_package_manager_install(const char *package);
 static void __apps_package_manager_uninstall(const char *package);
 
+
 void apps_package_manager_init()
 {
        int ret;
@@ -227,9 +228,7 @@ static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e
 
 static void __apps_package_manager_install(const char *package)
 {
-       app_info_h app_info = NULL;
        package_info_h package_info = NULL;
-       app_data_t *item = NULL;
        int ret = PACKAGE_MANAGER_ERROR_NONE;
 
        ret = package_info_create(package, &package_info);

diff --git a/src/page_indicator.c b/src/page_indicator.c
index fea8aaf..d3dd3da 100755 (executable)
--- a/src/page_indicator.c
+++ b/src/page_indicator.c
@@ -277,7 +277,6 @@ static void __page_indicator_set_current_page(page_indicator_t *page_indicator)
 static void __page_indicator_unit_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        unsigned int clicked_indicator_unit = 0;
-       Evas_Object *page_indicator_unit = NULL;
        page_indicator_t *page_indicator = data;
        Evas_Object *unit = obj;
        int i;