From d4f17c20ff58d35f66a6795c22dbc37a19998647 Mon Sep 17 00:00:00 2001
From: Chanwoo Choi <cw00.choi@samsung.com>
Date: Wed, 17 Feb 2021 10:58:29 +0900
Subject: [PATCH] halapi: Move all extra files into packaging directory

Change-Id: I5e09bfad0ee0d7f824a28198c2f35ad1727736da
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 CMakeLists.txt                                      | 8 +++++---
 hal-api-common.pc => packaging/hal-api-common.pc.in | 0
 hal-api.json => packaging/hal-api.json              | 0
 tests/unittest/test_hal.cc                          | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename hal-api-common.pc => packaging/hal-api-common.pc.in (100%)
 rename hal-api.json => packaging/hal-api.json (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60a8c50..ae9fd01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,13 +43,15 @@ TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${pkgs_LDFLAGS} -ldl -Wl,-z,nodelete,--no
 SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
-CONFIGURE_FILE( ${PROJECT_NAME}.pc ${PROJECT_NAME}.pc @ONLY)
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc.in
+	${CMAKE_CURRENT_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc
+	@ONLY)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}/hal)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
 	DESTINATION ${INCLUDEDIR}/hal
 	FILES_MATCHING PATTERN "*.h")
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc
 	DESTINATION ${LIBDIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hal-api.json DESTINATION /etc/hal)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/hal-api.json DESTINATION /etc/hal)
 
 ADD_SUBDIRECTORY(tests)
diff --git a/hal-api-common.pc b/packaging/hal-api-common.pc.in
similarity index 100%
rename from hal-api-common.pc
rename to packaging/hal-api-common.pc.in
diff --git a/hal-api.json b/packaging/hal-api.json
similarity index 100%
rename from hal-api.json
rename to packaging/hal-api.json
diff --git a/tests/unittest/test_hal.cc b/tests/unittest/test_hal.cc
index 9c8ae7f..dc3c851 100644
--- a/tests/unittest/test_hal.cc
+++ b/tests/unittest/test_hal.cc
@@ -35,7 +35,7 @@ using namespace std;
 
 extern "C" const char *tzplatform_mkpath(
    enum tzplatform_variable id, const char *path) {
-   return "../../hal-api.json";
+   return "../../packaging/hal-api.json";
 }
 
 class CommonHaltest : public testing::Test {
-- 
2.7.4