Change file name of hal-common-interface.h to hal-backend-common-usb_gadget.h

/usr/include/hal/device/hal-common-interface.h ==> /hal/include/device/hal-common-interface.h

Change-Id: I754eaa873264a707dc420cc43a52a5384fed11d3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d13e5ff..bf21e4b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-common_pkgs_LDFLAGS})
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.Apache-2.0 DESTINATION ${HAL_LICENSE_DIR}/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/hal-common-interface.h DESTINATION include/hal/device)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/hal-backend-common-usb_gadget.h DESTINATION ${HAL_INCLUDE_DIR}/device)
 
 CONFIGURE_FILE(hal-backend-device-common.pc.in hal-backend-device-common.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hal-backend-device-common.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/hal-backend-device-common.pc.in b/hal-backend-device-common.pc.in
index 502f51d..4fe410c 100644 (file)
--- a/hal-backend-device-common.pc.in
+++ b/hal-backend-device-common.pc.in
@@ -3,4 +3,4 @@
 Name: HAL backend device common
 Description: Library for HAL backend device modules
 Version: 1.1
-Libs: -L@HAL_LIB_DIR@ -Wl,-rpath,@HAL_LIB_DIR@ -lhal-backend-device-common
+Libs: -L@HAL_LIB_DIR@ -Wl,-rpath,@HAL_LIB_DIR@ -lhal-backend-device-common
\ No newline at end of file

diff --git a/include/hal-common-interface.h b/include/hal-backend-common-usb_gadget.h
similarity index 89%
rename from include/hal-common-interface.h
rename to include/hal-backend-common-usb_gadget.h
index 662efb4..fd5f7f0 100644 (file)
--- a/include/hal-common-interface.h
+++ b/include/hal-backend-common-usb_gadget.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef __HAL_COMMON_H_
-#define __HAL_COMMON_H_
+#ifndef __HAL_BACKEND_COMMON_USB_GADGET_H__
+#define __HAL_BACKEND_COMMON_USB_GADGET_H__
 
 #include <hal/device/hal-usb_gadget-interface.h>
 
@@ -36,4 +36,4 @@ int hw_cfs_gadget_close(hal_backend_usb_gadget_funcs *usb_gadget_funcs);
 #ifdef __cplusplus
 }
 #endif
-#endif /* __HAL_BOARD_INTERFACE_H__ */
+#endif /* __HAL_BACKEND_COMMON_USB_GADGET_H__ */

diff --git a/packaging/hal-backend-device-common.spec b/packaging/hal-backend-device-common.spec
index 17db5ef..bbdec8f 100644 (file)
--- a/packaging/hal-backend-device-common.spec
+++ b/packaging/hal-backend-device-common.spec
@@ -27,7 +27,8 @@ cp %{SOURCE1} .
 
 %build
 %cmake . -DHAL_LIB_DIR=%{_hal_libdir} \
-       -DHAL_LICENSE_DIR=%{_hal_licensedir}
+         -DHAL_INCLUDE_DIR=%{_hal_includedir} \
+         -DHAL_LICENSE_DIR=%{_hal_licensedir}
 
 make %{?jobs:-j%jobs}
 
@@ -42,5 +43,5 @@ make %{?jobs:-j%jobs}
 %files devel
 %manifest %{name}.manifest
 %{_hal_licensedir}/%{name}/LICENSE.Apache-2.0
-%{_includedir}/hal/device/hal-common-interface.h
+%{_hal_includedir}/device/hal-backend-common-usb_gadget.h
 %{_libdir}/pkgconfig/*.pc

diff --git a/src/usb_gadget/usb_cfs_client_common.c b/src/usb_gadget/usb_cfs_client_common.c
index 89ccd32..1eac44d 100644 (file)
--- a/src/usb_gadget/usb_cfs_client_common.c
+++ b/src/usb_gadget/usb_cfs_client_common.c
@@ -1,6 +1,4 @@
 /*
- * libdevice-node
- *
  * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the License);

diff --git a/src/usb_gadget/usb_client_common.c b/src/usb_gadget/usb_client_common.c
index ab554f3..f08ac61 100644 (file)
--- a/src/usb_gadget/usb_client_common.c
+++ b/src/usb_gadget/usb_client_common.c
@@ -1,6 +1,4 @@
 /*
- * libdevice-node
- *
  * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the License);

diff --git a/src/usb_gadget/usb_gadget.h b/src/usb_gadget/usb_gadget.h
index ac14373..507196a 100644 (file)
--- a/src/usb_gadget/usb_gadget.h
+++ b/src/usb_gadget/usb_gadget.h
@@ -1,6 +1,4 @@
 /*
- * libdevice-node
- *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the License);

diff --git a/src/usb_gadget/usb_gadget_common.c b/src/usb_gadget/usb_gadget_common.c
index 0628744..786f4b7 100644 (file)
--- a/src/usb_gadget/usb_gadget_common.c
+++ b/src/usb_gadget/usb_gadget_common.c
@@ -1,6 +1,4 @@
 /*
- * libdevice-node
- *
  * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the License);