From 767c6b9a107b600b9d6cfa9d7db9227a2e50f851 Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Mon, 20 Jul 2020 16:24:55 +0900 Subject: [PATCH] Revise directory structure Change-Id: Ifc73069efe05d2bad2229c19dd473dba117424bc --- src/CMakeLists.txt | 21 ++++++++++++++------- src/{session => }/asp-coordination-protocol.c | 0 src/{session => }/asp-coordination-protocol.h | 0 src/{session => }/asp-p2p-conn.c | 0 src/{session => }/asp-p2p-conn.h | 0 src/{service => }/asp-service.c | 0 src/{session => }/asp-session-peer-interface.h | 0 src/{session => }/asp-session-peer.c | 0 src/{session => }/asp-session-peer.h | 0 src/{session => }/asp-session.c | 0 src/{tech => }/asp-tech-ble.c | 0 src/{tech => }/asp-tech-ble.h | 0 src/{tech => }/asp-tech-infra.c | 0 src/{tech => }/asp-tech-infra.h | 0 src/{tech => }/asp-tech-nan.c | 0 src/{tech => }/asp-tech-nan.h | 0 src/{tech => }/asp-tech-nfc.c | 0 src/{tech => }/asp-tech-nfc.h | 0 src/{tech => }/asp-tech-p2p.c | 0 src/{tech => }/asp-tech-p2p.h | 0 src/{tech => }/asp-tech.c | 0 src/{session => }/gfsm.c | 0 src/{session => }/gfsm.h | 0 23 files changed, 14 insertions(+), 7 deletions(-) rename src/{session => }/asp-coordination-protocol.c (100%) rename src/{session => }/asp-coordination-protocol.h (100%) rename src/{session => }/asp-p2p-conn.c (100%) rename src/{session => }/asp-p2p-conn.h (100%) rename src/{service => }/asp-service.c (100%) rename src/{session => }/asp-session-peer-interface.h (100%) rename src/{session => }/asp-session-peer.c (100%) rename src/{session => }/asp-session-peer.h (100%) rename src/{session => }/asp-session.c (100%) rename src/{tech => }/asp-tech-ble.c (100%) rename src/{tech => }/asp-tech-ble.h (100%) rename src/{tech => }/asp-tech-infra.c (100%) rename src/{tech => }/asp-tech-infra.h (100%) rename src/{tech => }/asp-tech-nan.c (100%) rename src/{tech => }/asp-tech-nan.h (100%) rename src/{tech => }/asp-tech-nfc.c (100%) rename src/{tech => }/asp-tech-nfc.h (100%) rename src/{tech => }/asp-tech-p2p.c (100%) rename src/{tech => }/asp-tech-p2p.h (100%) rename src/{tech => }/asp-tech.c (100%) rename src/{session => }/gfsm.c (100%) rename src/{session => }/gfsm.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f7b423..dfe4d34 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,24 +22,31 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/interfaces) SET(SRCS + ${CMAKE_SOURCE_DIR}/src/asp-coordination-protocol.c ${CMAKE_SOURCE_DIR}/src/asp-manager.c ${CMAKE_SOURCE_DIR}/src/asp-manager-event.c ${CMAKE_SOURCE_DIR}/src/asp-manager-gdbus.c - ${CMAKE_SOURCE_DIR}/src/asp-manager-util.c ${CMAKE_SOURCE_DIR}/src/asp-manager-main.c + ${CMAKE_SOURCE_DIR}/src/asp-manager-util.c + ${CMAKE_SOURCE_DIR}/src/asp-p2p-conn.c + ${CMAKE_SOURCE_DIR}/src/asp-service.c + ${CMAKE_SOURCE_DIR}/src/asp-session.c + ${CMAKE_SOURCE_DIR}/src/asp-session-peer.c + ${CMAKE_SOURCE_DIR}/src/asp-tech-ble.c + ${CMAKE_SOURCE_DIR}/src/asp-tech.c + ${CMAKE_SOURCE_DIR}/src/asp-tech-infra.c + ${CMAKE_SOURCE_DIR}/src/asp-tech-nan.c + ${CMAKE_SOURCE_DIR}/src/asp-tech-nfc.c + ${CMAKE_SOURCE_DIR}/src/asp-tech-p2p.c + ${CMAKE_SOURCE_DIR}/src/gfsm.c ${CMAKE_SOURCE_DIR}/interfaces/generated-code.c ) SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/interfaces/generated-code.c PROPERTIES GENERATED TRUE) -FILE(GLOB SERVICE_SRCS ${CMAKE_SOURCE_DIR}/src/service/*.c) -FILE(GLOB SESSION_SRCS ${CMAKE_SOURCE_DIR}/src/session/*.c) -FILE(GLOB TECH_SRCS ${CMAKE_SOURCE_DIR}/src/tech/*.c) - - ADD_DEFINITIONS("-DUSE_DLOG") -ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} ${SERVICE_SRCS} ${SESSION_SRCS} ${TECH_SRCS}) +ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) ADD_DEPENDENCIES(${PROJECT_NAME} GENERATED_DBUS_CODE) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${asp_pkgs_LDFLAGS} -ldl) diff --git a/src/session/asp-coordination-protocol.c b/src/asp-coordination-protocol.c similarity index 100% rename from src/session/asp-coordination-protocol.c rename to src/asp-coordination-protocol.c diff --git a/src/session/asp-coordination-protocol.h b/src/asp-coordination-protocol.h similarity index 100% rename from src/session/asp-coordination-protocol.h rename to src/asp-coordination-protocol.h diff --git a/src/session/asp-p2p-conn.c b/src/asp-p2p-conn.c similarity index 100% rename from src/session/asp-p2p-conn.c rename to src/asp-p2p-conn.c diff --git a/src/session/asp-p2p-conn.h b/src/asp-p2p-conn.h similarity index 100% rename from src/session/asp-p2p-conn.h rename to src/asp-p2p-conn.h diff --git a/src/service/asp-service.c b/src/asp-service.c similarity index 100% rename from src/service/asp-service.c rename to src/asp-service.c diff --git a/src/session/asp-session-peer-interface.h b/src/asp-session-peer-interface.h similarity index 100% rename from src/session/asp-session-peer-interface.h rename to src/asp-session-peer-interface.h diff --git a/src/session/asp-session-peer.c b/src/asp-session-peer.c similarity index 100% rename from src/session/asp-session-peer.c rename to src/asp-session-peer.c diff --git a/src/session/asp-session-peer.h b/src/asp-session-peer.h similarity index 100% rename from src/session/asp-session-peer.h rename to src/asp-session-peer.h diff --git a/src/session/asp-session.c b/src/asp-session.c similarity index 100% rename from src/session/asp-session.c rename to src/asp-session.c diff --git a/src/tech/asp-tech-ble.c b/src/asp-tech-ble.c similarity index 100% rename from src/tech/asp-tech-ble.c rename to src/asp-tech-ble.c diff --git a/src/tech/asp-tech-ble.h b/src/asp-tech-ble.h similarity index 100% rename from src/tech/asp-tech-ble.h rename to src/asp-tech-ble.h diff --git a/src/tech/asp-tech-infra.c b/src/asp-tech-infra.c similarity index 100% rename from src/tech/asp-tech-infra.c rename to src/asp-tech-infra.c diff --git a/src/tech/asp-tech-infra.h b/src/asp-tech-infra.h similarity index 100% rename from src/tech/asp-tech-infra.h rename to src/asp-tech-infra.h diff --git a/src/tech/asp-tech-nan.c b/src/asp-tech-nan.c similarity index 100% rename from src/tech/asp-tech-nan.c rename to src/asp-tech-nan.c diff --git a/src/tech/asp-tech-nan.h b/src/asp-tech-nan.h similarity index 100% rename from src/tech/asp-tech-nan.h rename to src/asp-tech-nan.h diff --git a/src/tech/asp-tech-nfc.c b/src/asp-tech-nfc.c similarity index 100% rename from src/tech/asp-tech-nfc.c rename to src/asp-tech-nfc.c diff --git a/src/tech/asp-tech-nfc.h b/src/asp-tech-nfc.h similarity index 100% rename from src/tech/asp-tech-nfc.h rename to src/asp-tech-nfc.h diff --git a/src/tech/asp-tech-p2p.c b/src/asp-tech-p2p.c similarity index 100% rename from src/tech/asp-tech-p2p.c rename to src/asp-tech-p2p.c diff --git a/src/tech/asp-tech-p2p.h b/src/asp-tech-p2p.h similarity index 100% rename from src/tech/asp-tech-p2p.h rename to src/asp-tech-p2p.h diff --git a/src/tech/asp-tech.c b/src/asp-tech.c similarity index 100% rename from src/tech/asp-tech.c rename to src/asp-tech.c diff --git a/src/session/gfsm.c b/src/gfsm.c similarity index 100% rename from src/session/gfsm.c rename to src/gfsm.c diff --git a/src/session/gfsm.h b/src/gfsm.h similarity index 100% rename from src/session/gfsm.h rename to src/gfsm.h -- 2.7.4