From: Sangyoon Jang Date: Thu, 29 Jan 2015 04:12:25 +0000 (+0900) Subject: Move internal header to src directory X-Git-Tag: submit/tizen/20150304.022845~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F34557%2F1;p=platform%2Fcore%2Fapi%2Fapp-manager.git Move internal header to src directory use quotes instead of angle brackets to include app-manager headers Change-Id: Ie0771e85d328ba931c9c29cda6b786cdf6de71f5 Signed-off-by: Sangyoon Jang --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e032fc..d938740 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,12 +44,7 @@ SET_TARGET_PROPERTIES(${fw_name} ) INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) -INSTALL( - DIRECTORY ${INC_DIR}/ DESTINATION include/appfw - FILES_MATCHING - PATTERN "*_private.h" EXCLUDE - PATTERN "${INC_DIR}/*.h" - ) +INSTALL(DIRECTORY ${INC_DIR}/ DESTINATION include/appfw) SET(PC_NAME ${fw_name}) SET(PC_REQUIRED ${pc_requires}) diff --git a/include/app_manager_internal.h b/include/app_manager_internal.h deleted file mode 100644 index f428c35..0000000 --- a/include/app_manager_internal.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __TIZEN_APPFW_APP_MANAGER_INTERNAL_H -#define __TIZEN_APPFW_APP_MANAGER_INTERNAL_H - -#include "app_manager.h" - -#ifndef API -#define API __attribute__ ((visibility("default"))) -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @file app_manager_internal.h - */ - -/** - * @addtogroup CAPI_APPLICATION_MANAGER_MODULE - * @{ - */ - -int app_manager_error(app_manager_error_e error, const char* function, const char *description); - -int app_context_foreach_app_context(app_manager_app_context_cb callback, void *user_data); - -int app_context_get_app_context(const char *app_id, app_context_h *app_context); - -int app_context_set_event_cb(app_manager_app_context_event_cb callback, void *user_data); - -void app_context_unset_event_cb(void); - -int app_info_foreach_app_info(app_manager_app_info_cb callback, void *user_data); - -int app_info_get_app_info(const char *app_id, app_info_h *app_info); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /* __TIZEN_APPFW_APP_MANAGER_INTERNAL_H */ diff --git a/src/app_context.c b/src/app_context.c index bbdc980..65bc80b 100755 --- a/src/app_context.c +++ b/src/app_context.c @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include "app_context.h" +#include "app_manager.h" +#include "app_manager_internal.h" #ifdef LOG_TAG #undef LOG_TAG diff --git a/src/app_info.c b/src/app_info.c index cdd0304..9da7057 100755 --- a/src/app_info.c +++ b/src/app_info.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include "app_info.h" +#include "app_manager.h" +#include "app_manager_internal.h" #ifdef LOG_TAG #undef LOG_TAG diff --git a/src/app_manager.c b/src/app_manager.c index 11f1343..6e38647 100755 --- a/src/app_manager.c +++ b/src/app_manager.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include "app_manager.h" +#include "app_manager_internal.h" #ifdef LOG_TAG #undef LOG_TAG diff --git a/src/app_manager_internal.h b/src/app_manager_internal.h new file mode 100644 index 0000000..f428c35 --- /dev/null +++ b/src/app_manager_internal.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __TIZEN_APPFW_APP_MANAGER_INTERNAL_H +#define __TIZEN_APPFW_APP_MANAGER_INTERNAL_H + +#include "app_manager.h" + +#ifndef API +#define API __attribute__ ((visibility("default"))) +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @file app_manager_internal.h + */ + +/** + * @addtogroup CAPI_APPLICATION_MANAGER_MODULE + * @{ + */ + +int app_manager_error(app_manager_error_e error, const char* function, const char *description); + +int app_context_foreach_app_context(app_manager_app_context_cb callback, void *user_data); + +int app_context_get_app_context(const char *app_id, app_context_h *app_context); + +int app_context_set_event_cb(app_manager_app_context_event_cb callback, void *user_data); + +void app_context_unset_event_cb(void); + +int app_info_foreach_app_info(app_manager_app_info_cb callback, void *user_data); + +int app_info_get_app_info(const char *app_id, app_info_h *app_info); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* __TIZEN_APPFW_APP_MANAGER_INTERNAL_H */