From 0c466a90ae12585d46d9c4ae2e6e07a17f39c794 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Tue, 17 Jan 2017 17:12:21 +0300 Subject: [PATCH] machinarium: move source code base from lib into src --- CMakeLists.txt | 6 +++--- {lib => src}/CMakeLists.txt | 0 {lib => src}/machinarium.h | 0 {lib => src}/machinarium_private.h | 0 {lib => src}/mm.c | 0 {lib => src}/mm.h | 0 {lib => src}/mm_accept.c | 0 {lib => src}/mm_bind.c | 0 {lib => src}/mm_buf.h | 0 {lib => src}/mm_connect.c | 0 {lib => src}/mm_context.c | 0 {lib => src}/mm_context.h | 0 {lib => src}/mm_fiber.c | 0 {lib => src}/mm_fiber.h | 0 {lib => src}/mm_getaddrinfo.c | 0 {lib => src}/mm_getpeername.c | 0 {lib => src}/mm_getsockname.c | 0 {lib => src}/mm_io.c | 0 {lib => src}/mm_io.h | 0 {lib => src}/mm_list.h | 0 {lib => src}/mm_macro.h | 0 {lib => src}/mm_read.c | 0 {lib => src}/mm_read.h | 0 {lib => src}/mm_read_sync.c | 0 {lib => src}/mm_scheduler.c | 0 {lib => src}/mm_scheduler.h | 0 {lib => src}/mm_write.c | 0 tests/makefile | 6 +++--- 28 files changed, 6 insertions(+), 6 deletions(-) rename {lib => src}/CMakeLists.txt (100%) rename {lib => src}/machinarium.h (100%) rename {lib => src}/machinarium_private.h (100%) rename {lib => src}/mm.c (100%) rename {lib => src}/mm.h (100%) rename {lib => src}/mm_accept.c (100%) rename {lib => src}/mm_bind.c (100%) rename {lib => src}/mm_buf.h (100%) rename {lib => src}/mm_connect.c (100%) rename {lib => src}/mm_context.c (100%) rename {lib => src}/mm_context.h (100%) rename {lib => src}/mm_fiber.c (100%) rename {lib => src}/mm_fiber.h (100%) rename {lib => src}/mm_getaddrinfo.c (100%) rename {lib => src}/mm_getpeername.c (100%) rename {lib => src}/mm_getsockname.c (100%) rename {lib => src}/mm_io.c (100%) rename {lib => src}/mm_io.h (100%) rename {lib => src}/mm_list.h (100%) rename {lib => src}/mm_macro.h (100%) rename {lib => src}/mm_read.c (100%) rename {lib => src}/mm_read.h (100%) rename {lib => src}/mm_read_sync.c (100%) rename {lib => src}/mm_scheduler.c (100%) rename {lib => src}/mm_scheduler.h (100%) rename {lib => src}/mm_write.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f139e1f..d872a3bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,8 @@ elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -O0") endif() -include_directories("${PROJECT_SOURCE_DIR}/lib") -include_directories("${PROJECT_BINARY_DIR}/lib") +include_directories("${PROJECT_SOURCE_DIR}/src") +include_directories("${PROJECT_BINARY_DIR}/src") set(mm_libraries "") @@ -26,7 +26,7 @@ include_directories(${LIBUV_INCLUDE_DIRS}) option(BUILD_STATIC "Enable Static" OFF) -add_subdirectory(lib) +add_subdirectory(src) message (STATUS "") message (STATUS "machinarium: cooperative multitasking library.") diff --git a/lib/CMakeLists.txt b/src/CMakeLists.txt similarity index 100% rename from lib/CMakeLists.txt rename to src/CMakeLists.txt diff --git a/lib/machinarium.h b/src/machinarium.h similarity index 100% rename from lib/machinarium.h rename to src/machinarium.h diff --git a/lib/machinarium_private.h b/src/machinarium_private.h similarity index 100% rename from lib/machinarium_private.h rename to src/machinarium_private.h diff --git a/lib/mm.c b/src/mm.c similarity index 100% rename from lib/mm.c rename to src/mm.c diff --git a/lib/mm.h b/src/mm.h similarity index 100% rename from lib/mm.h rename to src/mm.h diff --git a/lib/mm_accept.c b/src/mm_accept.c similarity index 100% rename from lib/mm_accept.c rename to src/mm_accept.c diff --git a/lib/mm_bind.c b/src/mm_bind.c similarity index 100% rename from lib/mm_bind.c rename to src/mm_bind.c diff --git a/lib/mm_buf.h b/src/mm_buf.h similarity index 100% rename from lib/mm_buf.h rename to src/mm_buf.h diff --git a/lib/mm_connect.c b/src/mm_connect.c similarity index 100% rename from lib/mm_connect.c rename to src/mm_connect.c diff --git a/lib/mm_context.c b/src/mm_context.c similarity index 100% rename from lib/mm_context.c rename to src/mm_context.c diff --git a/lib/mm_context.h b/src/mm_context.h similarity index 100% rename from lib/mm_context.h rename to src/mm_context.h diff --git a/lib/mm_fiber.c b/src/mm_fiber.c similarity index 100% rename from lib/mm_fiber.c rename to src/mm_fiber.c diff --git a/lib/mm_fiber.h b/src/mm_fiber.h similarity index 100% rename from lib/mm_fiber.h rename to src/mm_fiber.h diff --git a/lib/mm_getaddrinfo.c b/src/mm_getaddrinfo.c similarity index 100% rename from lib/mm_getaddrinfo.c rename to src/mm_getaddrinfo.c diff --git a/lib/mm_getpeername.c b/src/mm_getpeername.c similarity index 100% rename from lib/mm_getpeername.c rename to src/mm_getpeername.c diff --git a/lib/mm_getsockname.c b/src/mm_getsockname.c similarity index 100% rename from lib/mm_getsockname.c rename to src/mm_getsockname.c diff --git a/lib/mm_io.c b/src/mm_io.c similarity index 100% rename from lib/mm_io.c rename to src/mm_io.c diff --git a/lib/mm_io.h b/src/mm_io.h similarity index 100% rename from lib/mm_io.h rename to src/mm_io.h diff --git a/lib/mm_list.h b/src/mm_list.h similarity index 100% rename from lib/mm_list.h rename to src/mm_list.h diff --git a/lib/mm_macro.h b/src/mm_macro.h similarity index 100% rename from lib/mm_macro.h rename to src/mm_macro.h diff --git a/lib/mm_read.c b/src/mm_read.c similarity index 100% rename from lib/mm_read.c rename to src/mm_read.c diff --git a/lib/mm_read.h b/src/mm_read.h similarity index 100% rename from lib/mm_read.h rename to src/mm_read.h diff --git a/lib/mm_read_sync.c b/src/mm_read_sync.c similarity index 100% rename from lib/mm_read_sync.c rename to src/mm_read_sync.c diff --git a/lib/mm_scheduler.c b/src/mm_scheduler.c similarity index 100% rename from lib/mm_scheduler.c rename to src/mm_scheduler.c diff --git a/lib/mm_scheduler.h b/src/mm_scheduler.h similarity index 100% rename from lib/mm_scheduler.h rename to src/mm_scheduler.h diff --git a/lib/mm_write.c b/src/mm_write.c similarity index 100% rename from lib/mm_write.c rename to src/mm_write.c diff --git a/tests/makefile b/tests/makefile index 16c94bc4..a326aa54 100644 --- a/tests/makefile +++ b/tests/makefile @@ -1,7 +1,7 @@ CC = gcc RM = rm -CFLAGS = -I. -Wall -g -O0 -I../lib -LFLAGS_LIB = ../lib/libmachinarium.a +CFLAGS = -I. -Wall -g -O0 -I../src +LFLAGS_LIB = ../src/libmachinarium.a LFLAGS_LIB_UV = -luv -pthread #~/temp/libuv/.libs/libuv.a -pthread LFLAGS = $(LFLAGS_LIB) $(LFLAGS_LIB_UV) TESTS = test_new \ @@ -63,7 +63,7 @@ echo: benchmark: $(CC) $(CFLAGS) benchmark.c $(LFLAGS) -o benchmark validate: - @if [ ! -f ../lib/libmachinarium.a ]; then \ + @if [ ! -f ../src/libmachinarium.a ]; then \ echo ""; \ echo "Please build the static library first."; \ echo ""; \