Revise directory structure 09/238909/1 accepted/tizen_6.0_unified accepted/tizen_6.0_unified_hotfix accepted/tizen_6.5_unified accepted/tizen_7.0_unified accepted/tizen_7.0_unified_hotfix accepted/tizen_8.0_unified tizen_6.0 tizen_6.0_hotfix tizen_6.5 tizen_7.0 tizen_7.0_hotfix tizen_8.0 accepted/tizen/6.0/unified/20201030.120257 accepted/tizen/6.0/unified/hotfix/20201103.050129 accepted/tizen/6.5/unified/20211028.095824 accepted/tizen/7.0/unified/20221110.062855 accepted/tizen/7.0/unified/hotfix/20221116.105135 accepted/tizen/8.0/unified/20231005.093155 accepted/tizen/unified/20200720.125552 submit/tizen/20200720.073624 submit/tizen_6.0/20201029.205103 submit/tizen_6.0_hotfix/20201102.192503 submit/tizen_6.0_hotfix/20201103.114803 submit/tizen_6.5/20211028.162201 tizen_6.0.m2_release tizen_6.5.m2_release tizen_7.0_m2_release tizen_8.0_m2_release
authorCheoleun Moon <chleun.moon@samsung.com>
Mon, 20 Jul 2020 07:24:55 +0000 (16:24 +0900)
committerCheoleun Moon <chleun.moon@samsung.com>
Mon, 20 Jul 2020 07:25:04 +0000 (16:25 +0900)
Change-Id: Ifc73069efe05d2bad2229c19dd473dba117424bc

23 files changed:
src/CMakeLists.txt
src/asp-coordination-protocol.c [moved from src/session/asp-coordination-protocol.c with 100% similarity]
src/asp-coordination-protocol.h [moved from src/session/asp-coordination-protocol.h with 100% similarity]
src/asp-p2p-conn.c [moved from src/session/asp-p2p-conn.c with 100% similarity]
src/asp-p2p-conn.h [moved from src/session/asp-p2p-conn.h with 100% similarity]
src/asp-service.c [moved from src/service/asp-service.c with 100% similarity]
src/asp-session-peer-interface.h [moved from src/session/asp-session-peer-interface.h with 100% similarity]
src/asp-session-peer.c [moved from src/session/asp-session-peer.c with 100% similarity]
src/asp-session-peer.h [moved from src/session/asp-session-peer.h with 100% similarity]
src/asp-session.c [moved from src/session/asp-session.c with 100% similarity]
src/asp-tech-ble.c [moved from src/tech/asp-tech-ble.c with 100% similarity]
src/asp-tech-ble.h [moved from src/tech/asp-tech-ble.h with 100% similarity]
src/asp-tech-infra.c [moved from src/tech/asp-tech-infra.c with 100% similarity]
src/asp-tech-infra.h [moved from src/tech/asp-tech-infra.h with 100% similarity]
src/asp-tech-nan.c [moved from src/tech/asp-tech-nan.c with 100% similarity]
src/asp-tech-nan.h [moved from src/tech/asp-tech-nan.h with 100% similarity]
src/asp-tech-nfc.c [moved from src/tech/asp-tech-nfc.c with 100% similarity]
src/asp-tech-nfc.h [moved from src/tech/asp-tech-nfc.h with 100% similarity]
src/asp-tech-p2p.c [moved from src/tech/asp-tech-p2p.c with 100% similarity]
src/asp-tech-p2p.h [moved from src/tech/asp-tech-p2p.h with 100% similarity]
src/asp-tech.c [moved from src/tech/asp-tech.c with 100% similarity]
src/gfsm.c [moved from src/session/gfsm.c with 100% similarity]
src/gfsm.h [moved from src/session/gfsm.h with 100% similarity]

index 3f7b423..dfe4d34 100755 (executable)
@@ -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)
similarity index 100%
rename from src/service/asp-service.c
rename to src/asp-service.c
similarity index 100%
rename from src/session/asp-session.c
rename to src/asp-session.c
similarity index 100%
rename from src/tech/asp-tech-ble.c
rename to src/asp-tech-ble.c
similarity index 100%
rename from src/tech/asp-tech-ble.h
rename to src/asp-tech-ble.h
similarity index 100%
rename from src/tech/asp-tech-nan.c
rename to src/asp-tech-nan.c
similarity index 100%
rename from src/tech/asp-tech-nan.h
rename to src/asp-tech-nan.h
similarity index 100%
rename from src/tech/asp-tech-nfc.c
rename to src/asp-tech-nfc.c
similarity index 100%
rename from src/tech/asp-tech-nfc.h
rename to src/asp-tech-nfc.h
similarity index 100%
rename from src/tech/asp-tech-p2p.c
rename to src/asp-tech-p2p.c
similarity index 100%
rename from src/tech/asp-tech-p2p.h
rename to src/asp-tech-p2p.h
similarity index 100%
rename from src/tech/asp-tech.c
rename to src/asp-tech.c
similarity index 100%
rename from src/session/gfsm.c
rename to src/gfsm.c
similarity index 100%
rename from src/session/gfsm.h
rename to src/gfsm.h