usb popup : change edc file name from usb.edc to usb-popup.edc

Change-Id: If2ce35f45d56fa37a289dfa232b7cf693de641f3
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec
index be9a625..bc4bfe0 100755 (executable)
--- a/packaging/system-servant.spec
+++ b/packaging/system-servant.spec
@@ -341,7 +341,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.system-syspopup/bin/system-syspopup
 %if "%{?profile}" == "mobile"
-%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/usb.edj
+%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/usb-popup.edj
 %endif
 %{TZ_SYS_RO_SHARE}/packages/org.tizen.system-syspopup.xml
 %endif

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2084f9..5e99c6d 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,10 +109,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -O2 -g -Wall -fpie")
 ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
 ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
+ADD_DEFINITIONS("-DSYSTEM_RES=\"${SYSTEM_RES}\"")
 IF(USB_POPUP STREQUAL on)
        IF(PROFILE_MOBILE)
-               ADD_DEFINITIONS("-DSYSTEM_RES=\"${SYSTEM_RES}\"")
-               ADD_DEFINITIONS("-DELM_USB_EDC=\"${SYSTEM_RES}/usb.edj\"")
+               ADD_DEFINITIONS("-DELM_USB_EDC=\"${SYSTEM_RES}/usb-popup.edj\"")
        ENDIF()
 ENDIF(USB_POPUP STREQUAL on)
 
@@ -126,13 +126,13 @@ INSTALL(TARGETS ${PACKAGE} DESTINATION ${BINDIR})
 
 IF(USB_POPUP STREQUAL on)
        IF(PROFILE_MOBILE)
-               ADD_CUSTOM_TARGET(usb.edj
-                       COMMAND edje_cc -no-save ${CMAKE_SOURCE_DIR}/src/usb/usb.edc ${CMAKE_BINARY_DIR}/usb.edj
-                       DEPENDS ${CMAKE_SOURCE_DIR}/src/usb/usb.edc
-                       COMMENT "making usb edj file"
+               ADD_CUSTOM_TARGET(usb-popup.edj
+                       COMMAND edje_cc -no-save ${CMAKE_SOURCE_DIR}/src/usb/usb-popup.edc ${CMAKE_BINARY_DIR}/usb-popup.edj
+                       DEPENDS ${CMAKE_SOURCE_DIR}/src/usb/usb-popup.edc
+                       COMMENT "making usb popup edj file"
                )
-               ADD_DEPENDENCIES(${PACKAGE} usb.edj)
-               INSTALL(FILES ${CMAKE_BINARY_DIR}/usb.edj DESTINATION ${SYSTEM_RES})
+               ADD_DEPENDENCIES(${PACKAGE} usb-popup.edj)
+               INSTALL(FILES ${CMAKE_BINARY_DIR}/usb-popup.edj DESTINATION ${SYSTEM_RES})
        ENDIF()
 ENDIF(USB_POPUP STREQUAL on)
 

diff --git a/src/usb/usb.edc b/src/usb/usb-popup.edc
similarity index 100%
rename from src/usb/usb.edc
rename to src/usb/usb-popup.edc